mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

a52dec: Check that the a52_state is correctly initialized

Browse source
This commit is contained in:
Julien Isorce 2011-12-13 14:52:26 +01:00 committed by Sebastian Dröge
parent da9f20eceb
commit cdf8d0f6b2
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/a52dec/gsta52dec.c
View file

@ -229,6 +229,9 @@ gst_a52dec_init (GstA52Dec * a52dec, GstA52DecClass * g_class)
a52dec->request_channels = A52_CHANNEL;
a52dec->dynamic_range_compression = FALSE;
a52dec->state = NULL;
a52dec->samples = NULL;
gst_segment_init (&a52dec->segment, GST_FORMAT_UNDEFINED);
}
@ -390,6 +393,7 @@ gst_a52dec_push (GstA52Dec * a52dec,
samples[c * 256 + n];
}
}
GST_BUFFER_TIMESTAMP (buf) = timestamp;
GST_BUFFER_DURATION (buf) = 256 * GST_SECOND / a52dec->sample_rate;
@ -596,8 +600,8 @@ gst_a52dec_handle_frame (GstA52Dec * a52dec, guint8 * data,
*/
gst_structure_fixate_field_nearest_int (structure, "channels",
flags ? gst_a52dec_channels (flags, NULL) : 6);
gst_structure_get_int (structure, "channels", &channels);
if (channels <= 6)
if (gst_structure_get_int (structure, "channels", &channels)
&& channels <= 6)
flags = a52_channels[channels - 1];
else
flags = a52_channels[5];
@ -870,6 +874,12 @@ gst_a52dec_change_state (GstElement * element, GstStateChange transition)
klass = GST_A52DEC_CLASS (G_OBJECT_GET_CLASS (a52dec));
a52dec->state = a52_init (klass->a52_cpuflags);
if (!a52dec->state) {
GST_ELEMENT_ERROR (GST_ELEMENT (a52dec), STREAM, DECODE, (NULL),
("Failed to initialize a52 state"));
ret = GST_STATE_CHANGE_FAILURE;
}
break;
}
case GST_STATE_CHANGE_READY_TO_PAUSED:
@ -905,8 +915,10 @@ gst_a52dec_change_state (GstElement * element, GstStateChange transition)
clear_queued (a52dec);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
a52_free (a52dec->state);
a52dec->state = NULL;
if (a52dec->state) {
a52_free (a52dec->state);
a52dec->state = NULL;
}
break;
default:
break;