mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

faad: drain sync pending frames when appropriate

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-02-10 23:29:23 +01:00
parent 5e3cdd233a
commit 83f1b71613
1 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
ext/faad/gstfaad.c
View file

@ -544,6 +544,9 @@ gst_faad_drain (GstFaad * faad)
/* if we have some queued frames for reverse playback, flush /* if we have some queued frames for reverse playback, flush
* them now */ * them now */
ret = flush_queued (faad); ret = flush_queued (faad);
} else {
/* squeeze any possible remaining frames that are pending sync */
gst_faad_chain (faad->sinkpad, NULL);
} }
return ret; return ret;
} }
@ -898,7 +901,8 @@ gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info)
* gst/typefind/) for ADTS because 12 bits isn't very reliable. * gst/typefind/) for ADTS because 12 bits isn't very reliable.
*/ */
static gboolean static gboolean
gst_faad_sync (GstFaad * faad, guint8 * data, guint size, guint * off) gst_faad_sync (GstFaad * faad, guint8 * data, guint size, gboolean next,
guint * off)
{ {
guint n = 0; guint n = 0;
gint snc; gint snc;
@ -928,8 +932,16 @@ gst_faad_sync (GstFaad * faad, guint8 * data, guint size, guint * off)
len = ((data[n + 3] & 0x03) << 11) | len = ((data[n + 3] & 0x03) << 11) |
(data[n + 4] << 3) | ((data[n + 5] & 0xe0) >> 5); (data[n + 4] << 3) | ((data[n + 5] & 0xe0) >> 5);
if (n + len + 2 >= size) { if (n + len + 2 >= size) {
GST_LOG_OBJECT (faad, "Next frame is not within reach"); GST_LOG_OBJECT (faad, "Frame size %d, next frame is not within reach",
break; len);
if (next) {
break;
} else if (n + len <= size) {
GST_LOG_OBJECT (faad, "but have complete frame and no next frame; "
"accept ADTS syncpoint at offset 0x%x (framelen %u)", n, len);
ret = TRUE;
break;
}
} }
snc = GST_READ_UINT16_BE (&data[n + len]); snc = GST_READ_UINT16_BE (&data[n + len]);
@ -994,23 +1006,29 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
gboolean run_loop = TRUE; gboolean run_loop = TRUE;
guint sync_off; guint sync_off;
GstClockTime ts; GstClockTime ts;
gboolean next;
faad = GST_FAAD (gst_pad_get_parent (pad)); faad = GST_FAAD (gst_pad_get_parent (pad));
GST_LOG_OBJECT (faad, "buffer of size %d with ts: %" GST_TIME_FORMAT if (G_LIKELY (buffer)) {
", duration %" GST_TIME_FORMAT, GST_BUFFER_SIZE (buffer), GST_LOG_OBJECT (faad, "buffer of size %d with ts: %" GST_TIME_FORMAT
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)), ", duration %" GST_TIME_FORMAT, GST_BUFFER_SIZE (buffer),
GST_TIME_ARGS (GST_BUFFER_DURATION (buffer))); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)),
GST_TIME_ARGS (GST_BUFFER_DURATION (buffer)));
if (GST_BUFFER_IS_DISCONT (buffer)) { if (GST_BUFFER_IS_DISCONT (buffer)) {
gst_faad_drain (faad); gst_faad_drain (faad);
gst_faad_reset_stream_state (faad); gst_faad_reset_stream_state (faad);
faad->discont = TRUE; faad->discont = TRUE;
}
gst_adapter_push (faad->adapter, buffer);
buffer = NULL;
next = TRUE;
} else {
next = FALSE;
} }
gst_adapter_push (faad->adapter, buffer);
buffer = NULL;
ts = gst_adapter_prev_timestamp (faad->adapter, NULL); ts = gst_adapter_prev_timestamp (faad->adapter, NULL);
if (GST_CLOCK_TIME_IS_VALID (ts) && (ts != faad->prev_ts)) if (GST_CLOCK_TIME_IS_VALID (ts) && (ts != faad->prev_ts))
faad->prev_ts = faad->next_ts = ts; faad->prev_ts = faad->next_ts = ts;
@ -1024,7 +1042,7 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
input_data = (guchar *) gst_adapter_peek (faad->adapter, available); input_data = (guchar *) gst_adapter_peek (faad->adapter, available);
if (!faad->packetised) { if (!faad->packetised) {
if (!gst_faad_sync (faad, input_data, input_size, &sync_off)) { if (!gst_faad_sync (faad, input_data, input_size, next, &sync_off)) {
faad->sync_flush += sync_off; faad->sync_flush += sync_off;
input_size -= sync_off; input_size -= sync_off;
if (faad->sync_flush > FAAD_MAX_SYNC) if (faad->sync_flush > FAAD_MAX_SYNC)