mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

faad: cater for renegotiation

Browse source 
At least, whenever either stream (e.g. ADTS) or upstream provides necessary
info for doing so.

Fixes #631501.
This commit is contained in:
Mark Nauwelaerts 2010-10-12 18:17:27 +02:00
parent 9b9d8a516b
commit 7499f2b09b
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/faad/gstfaad.c
View file

@ -268,6 +268,7 @@ gst_faad_reset (GstFaad * faad)
faad->bytes_in = 0; faad->bytes_in = 0;
faad->sum_dur_out = 0; faad->sum_dur_out = 0;
faad->error_count = 0; faad->error_count = 0;
faad->last_header = 0;
gst_faad_reset_stream_state (faad); gst_faad_reset_stream_state (faad);
} }
@ -391,6 +392,7 @@ gst_faad_setcaps (GstPad * pad, GstCaps * caps)
} else if ((value = gst_structure_get_value (str, "framed")) && } else if ((value = gst_structure_get_value (str, "framed")) &&
g_value_get_boolean (value) == TRUE) { g_value_get_boolean (value) == TRUE) {
faad->packetised = TRUE; faad->packetised = TRUE;
faad->init = FALSE;
GST_DEBUG_OBJECT (faad, "we have packetized audio"); GST_DEBUG_OBJECT (faad, "we have packetized audio");
} else { } else {
faad->init = FALSE; faad->init = FALSE;
@ -1098,6 +1100,7 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
} }
} }
init:
/* init if not already done during capsnego */ /* init if not already done during capsnego */
if (!faad->init) { if (!faad->init) {
#if FAAD2_MINOR_VERSION >= 7 #if FAAD2_MINOR_VERSION >= 7
@ -1147,6 +1150,14 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
if (input_size < FAAD_MIN_STREAMSIZE || info.bytesconsumed <= 0) { if (input_size < FAAD_MIN_STREAMSIZE || info.bytesconsumed <= 0) {
break; break;
} }
/* faad only really parses ADTS header at Init time, not when decoding,
* so monitor for changes and kick faad when needed */
if (GST_READ_UINT32_BE (input_data) >> 4 != faad->last_header >> 4) {
GST_DEBUG_OBJECT (faad, "ADTS header changed, forcing Init");
faad->init = FALSE;
faad->last_header = GST_READ_UINT32_BE (input_data);
goto init;
}
} }
out = faacDecDecode (faad->handle, &info, input_data, input_size); out = faacDecDecode (faad->handle, &info, input_data, input_size);

1
ext/faad/gstfaad.h
View file

@ -53,6 +53,7 @@ typedef struct _GstFaad {
guchar *channel_positions; guchar *channel_positions;
guint8 fake_codec_data[2]; guint8 fake_codec_data[2];
guint32 last_header;
GstAdapter *adapter; GstAdapter *adapter;