commit 1e96e05449cde418f0368fef92cd23b9db4ab59c
author Lyon Wang <lyon.wang@freescale.com> Mon Dec 15 16:52:07 2014 +0800
committer Lyon Wang <lyon.wang@nxp.com> Wed Dec 19 10:50:31 2018 +0800
tree fca94d06a50cf1981460e7f0dba6cbad670556ce
parent f4205f77ce37d7ea6ba2a9f404678eabd22e246a

handle audio/video decoder error

When there is input data and no output data to the end of the stream, it will
send GST_ELEMENT_ERROR, So the clips playing will quit.
However, if only one of the tracks is corrupt, there is no need to quit other
tracks playing.

The patch comments the GST_ELEMENT_ERROR() and just add GST_ERROR_OBJECT()
information instead.

https://bugzilla.gnome.org/show_bug.cgi?id=741542

Upstream Status: Pending

Signed-off-by: Lyon Wang <lyon.wang@freescale.com>

gst-libs/gst/audio/gstaudiodecoder.c

diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
old mode 100644
new mode 100755
index 67a6ee1..1d918bd
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -2258,9 +2258,10 @@
       GST_AUDIO_DECODER_STREAM_UNLOCK (dec);
 
       if (dec->priv->ctx.had_input_data && !dec->priv->ctx.had_output_data) {
-        GST_ELEMENT_ERROR (dec, STREAM, DECODE,
+        /* GST_ELEMENT_ERROR (dec, STREAM, DECODE,
             ("No valid frames decoded before end of stream"),
-            ("no valid frames found"));
+            ("no valid frames found")); */
+        GST_ERROR_OBJECT(dec, "No valid frames decoded before end of stream");
       }
 
       /* send taglist if no valid frame is decoded util EOS */

gst-libs/gst/video/gstvideodecoder.c

diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
old mode 100644
new mode 100755
index 1e357a4..a1812db
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -1156,9 +1156,10 @@
 
       /* Error out even if EOS was ok when we had input, but no output */
       if (ret && priv->had_input_data && !priv->had_output_data) {
-        GST_ELEMENT_ERROR (decoder, STREAM, DECODE,
+        /* GST_ELEMENT_ERROR (decoder, STREAM, DECODE,
             ("No valid frames decoded before end of stream"),
-            ("no valid frames found"));
+            ("no valid frames found")); */
+        GST_ERROR_OBJECT(decoder, "No valid frames decoded before end of stream");
       }
 
       /* Forward EOS immediately. This is required because no