From: Olivier Crête <olivier.crete@collabora.com>
Date: Thu, 19 May 2016 16:26:05 +0000 (-0400)
Subject: opus: Post error message on GST_FLOW_ERROR
X-Git-Tag: 1.19.3~511^2~2836
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bfed26f5685560f33c7e1a8759619e53d27a330;p=platform%2Fupstream%2Fgstreamer.git

opus: Post error message on GST_FLOW_ERROR

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

diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c
index 740329a..1594e99 100644
--- a/ext/opus/gstopusdec.c
+++ b/ext/opus/gstopusdec.c
@@ -316,7 +316,8 @@ gst_opus_dec_parse_header (GstOpusDec * dec, GstBuffer * buf)
   const GstAudioChannelPosition *posn = NULL;
 
   if (!gst_opus_header_is_id_header (buf)) {
-    GST_ERROR_OBJECT (dec, "Header is not an Opus ID header");
+    GST_ELEMENT_ERROR (dec, STREAM, FORMAT, ("Header is not an Opus ID header"),
+        (NULL));
     return GST_FLOW_ERROR;
   }
 
@@ -327,7 +328,8 @@ gst_opus_dec_parse_header (GstOpusDec * dec, GstBuffer * buf)
           &dec->n_streams,
           &dec->n_stereo_streams,
           dec->channel_mapping, &dec->pre_skip, &dec->r128_gain)) {
-    GST_ERROR_OBJECT (dec, "Failed to parse Opus ID header");
+    GST_ELEMENT_ERROR (dec, STREAM, DECODE, ("Failed to parse Opus ID header"),
+        (NULL));
     return GST_FLOW_ERROR;
   }
   dec->r128_gain_volume = gst_opus_dec_get_r128_volume (dec->r128_gain);
@@ -646,11 +648,13 @@ done:
   return res;
 
 creation_failed:
-  GST_ERROR_OBJECT (dec, "Failed to create Opus decoder: %d", err);
+  GST_ELEMENT_ERROR (dec, LIBRARY, INIT, ("Failed to create Opus decoder"),
+      ("Failed to create Opus decoder (%d): %s", err, opus_strerror (err)));
   return GST_FLOW_ERROR;
 
 buffer_failed:
-  GST_ERROR_OBJECT (dec, "Failed to create %u byte buffer", packet_size);
+  GST_ELEMENT_ERROR (dec, STREAM, DECODE,
+      ("Failed to create %u byte buffer", packet_size), (NULL));
   return GST_FLOW_ERROR;
 }
 
diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
index 0d4d855..e309bc0 100644
--- a/ext/opus/gstopusenc.c
+++ b/ext/opus/gstopusenc.c
@@ -1044,13 +1044,14 @@ gst_opus_enc_encode (GstOpusEnc * enc, GstBuffer * buf)
   gst_buffer_unmap (outbuf, &omap);
 
   if (outsize < 0) {
-    GST_ERROR_OBJECT (enc, "Encoding failed: %d", outsize);
+    GST_ELEMENT_ERROR (enc, STREAM, ENCODE, ("Encoding failed"),
+        ("Encoding ifailed (%d): %s", outsize, opus_strerror (outsize)));
     ret = GST_FLOW_ERROR;
     goto done;
   } else if (outsize > max_payload_size) {
-    GST_WARNING_OBJECT (enc,
-        "Encoded size %d is higher than max payload size (%d bytes)",
-        outsize, max_payload_size);
+    GST_ELEMENT_ERROR (enc, STREAM, ENCODE, ("Encoder error"),
+        ("Encoded size %d is higher than max payload size (%d bytes)",
+            outsize, max_payload_size));
     ret = GST_FLOW_ERROR;
     goto done;
   }