mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 10:10:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio: Add error handling to gst_audio_decoder_drain()

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=740686
This commit is contained in:
Sanjay NM 2014-12-10 16:10:58 +05:30 committed by Sebastian Dröge
parent f5cf586e77
commit d226d45d2f
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/audio/gstaudiodecoder.c
View file

@ -1448,8 +1448,16 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
gst_audio_decoder_chain_reverse (dec, NULL); gst_audio_decoder_chain_reverse (dec, NULL);
/* have subclass give all it can */ /* have subclass give all it can */
ret = gst_audio_decoder_push_buffers (dec, TRUE); ret = gst_audio_decoder_push_buffers (dec, TRUE);
if (ret != GST_FLOW_OK) {
GST_WARNING_OBJECT (dec, "audio decoder push buffers failed");
goto drain_failed;
}
/* ensure all output sent */ /* ensure all output sent */
ret = gst_audio_decoder_output (dec, NULL); ret = gst_audio_decoder_output (dec, NULL);
if (ret != GST_FLOW_OK)
GST_WARNING_OBJECT (dec, "audio decoder output failed");
drain_failed:
/* everything should be away now */ /* everything should be away now */
if (dec->priv->frames.length) { if (dec->priv->frames.length) {
/* not fatal/impossible though if subclass/codec eats stuff */ /* not fatal/impossible though if subclass/codec eats stuff */
@ -1458,9 +1466,9 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
g_queue_foreach (&dec->priv->frames, (GFunc) gst_buffer_unref, NULL); g_queue_foreach (&dec->priv->frames, (GFunc) gst_buffer_unref, NULL);
g_queue_clear (&dec->priv->frames); g_queue_clear (&dec->priv->frames);
} }
/* discard (unparsed) leftover */ /* discard (unparsed) leftover */
gst_adapter_clear (dec->priv->adapter); gst_adapter_clear (dec->priv->adapter);
return ret; return ret;
} }
} }