mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

faad: reflow opening and closing decoder

Browse source 
In particular, this reconfigures quite forcefully when renegotiation is needed.

Fixes #631501.
This commit is contained in:
Mark Nauwelaerts 2010-10-14 11:24:42 +02:00
parent 231d4d9bdc
commit 8a6c490962
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ext/faad/gstfaad.c
View file

@ -334,6 +334,9 @@ gst_faad_setcaps (GstPad * pad, GstCaps * caps)
GstBuffer *buf;
const GValue *value;
/* clean up current decoder, rather than trying to reconfigure */
gst_faad_close_decoder (faad);
/* Assume raw stream */
faad->packetised = FALSE;
@ -365,6 +368,8 @@ gst_faad_setcaps (GstPad * pad, GstCaps * caps)
(((cdata[0] & 0x07) << 1) | ((cdata[1] & 0x80) >> 7)),
((cdata[1] & 0x78) >> 3));
if (!gst_faad_open_decoder (faad))
goto open_failed;
/* someone forgot that char can be unsigned when writing the API */
if ((gint8) faacDecInit2 (faad->handle, cdata, csize, &samplerate,
&channels) < 0)
@ -429,6 +434,12 @@ wrong_length:
gst_object_unref (faad);
return FALSE;
}
open_failed:
{
GST_DEBUG_OBJECT (faad, "failed to create decoder");
gst_object_unref (faad);
return FALSE;
}
init_failed:
{
GST_DEBUG_OBJECT (faad, "faacDecInit2() failed");
@ -1111,6 +1122,8 @@ init:
guint8 ch;
GST_DEBUG_OBJECT (faad, "initialising ...");
if (!gst_faad_open_decoder (faad))
goto open_failed;
/* We check if the first data looks like it might plausibly contain
* appropriate initialisation info... if not, we use our fake_codec_data
*/
@ -1154,8 +1167,10 @@ init:
* 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);
/* kick hard */
gst_faad_close_decoder (faad);
faad->init = FALSE;
goto init;
}
}
@ -1277,6 +1292,13 @@ out:
return ret;
/* ERRORS */
open_failed:
{
GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
("Failed to open decoder"));
ret = GST_FLOW_ERROR;
goto out;
}
init_failed:
{
GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
@ -1363,8 +1385,6 @@ gst_faad_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_faad_open_decoder (faad))
return GST_STATE_CHANGE_FAILURE;
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
break;
@ -1378,9 +1398,9 @@ gst_faad_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_faad_reset (faad);
gst_faad_close_decoder (faad);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
gst_faad_close_decoder (faad);
break;
default:
break;