mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "audiodecoder: Error out earlier in a few places if something goes wrong"

Browse source 
This reverts commit eb68a2d5a7.

This sometimes errors out too early now, needs some more thoughts.
This commit is contained in:
Sebastian Dröge 2012-06-04 10:01:42 +02:00
parent f609b3a627
commit 2667d4bb82
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -772,11 +772,8 @@ again:
}
if (inbuf) {
if (ret == GST_FLOW_OK) {
buf = inbuf;
goto again;
}
gst_buffer_unref (inbuf);
buf = inbuf;
goto again;
}
}
@ -1053,6 +1050,7 @@ gst_audio_decoder_push_buffers (GstAudioDecoder * dec, gboolean force)
GST_DEBUG_OBJECT (dec, "available: %d", av);
while (ret == GST_FLOW_OK) {
flush = 0;
ctx->eos = force;
@ -1152,21 +1150,15 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
if (dec->priv->drained && !dec->priv->gather)
return GST_FLOW_OK;
else {
GstFlowReturn ret2;
/* dispatch reverse pending buffers */
/* chain eventually calls upon drain as well, but by that time
* gather list should be clear, so ok ... */
if (dec->output_segment.rate < 0.0 && dec->priv->gather)
gst_audio_decoder_chain_reverse (dec, NULL);
/* have subclass give all it can, if this fails we
* still want the subclass to output everything it
* can but we will return the error from here */
ret2 = gst_audio_decoder_push_buffers (dec, TRUE);
/* have subclass give all it can */
ret = gst_audio_decoder_push_buffers (dec, TRUE);
/* ensure all output sent */
ret = gst_audio_decoder_output (dec, NULL);
if (ret2 != GST_FLOW_OK)
ret = ret2;
/* everything should be away now */
if (dec->priv->frames.length) {
/* not fatal/impossible though if subclass/codec eats stuff */
@ -1342,8 +1334,6 @@ gst_audio_decoder_flush_decode (GstAudioDecoder * dec)
/* decode buffer, resulting data prepended to output queue */
gst_buffer_ref (buf);
res = gst_audio_decoder_chain_forward (dec, buf);
if (res != GST_FLOW_OK)
return res;
/* if we generated output, we can discard the buffer, else we
* keep it in the queue */