projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8fc42f1
)
opusdec: Use GST_AUDIO_DECODER_ERROR
author
Olivier Crête
<olivier.crete@collabora.com>
Sat, 14 May 2016 12:41:28 +0000
(14:41 +0200)
committer
Olivier Crête
<olivier.crete@collabora.com>
Wed, 18 May 2016 19:25:38 +0000
(15:25 -0400)
This way, the first invalid stream won't break all decoding.
https://bugzilla.gnome.org/show_bug.cgi?id=766265
ext/opus/gstopusdec.c
patch
|
blob
|
history
diff --git
a/ext/opus/gstopusdec.c
b/ext/opus/gstopusdec.c
index
d403fcc
..
740329a
100644
(file)
--- a/
ext/opus/gstopusdec.c
+++ b/
ext/opus/gstopusdec.c
@@
-554,9
+554,12
@@
opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer)
gst_buffer_unmap (buf, &map);
if (n < 0) {
- GST_ELEMENT_ERROR (dec, STREAM, DECODE, ("Decoding error: %d", n), (NULL));
+ GstFlowReturn ret = GST_FLOW_ERROR;
+
gst_buffer_unref (outbuf);
- return GST_FLOW_ERROR;
+ GST_AUDIO_DECODER_ERROR (dec, 1, STREAM, DECODE, ("Error decoding stream"),
+ ("Decoding error (%d): %s", n, opus_strerror (n)), ret);
+ return ret;
}
GST_DEBUG_OBJECT (dec, "decoded %d samples", n);
gst_buffer_set_size (outbuf, n * 2 * dec->n_channels);