From e041ff697d2ba33f1d71db70451eb6ddacff844c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Fri, 11 Dec 2020 16:26:00 -0500
Subject: sbc: Return hard error on allocation or mapping error

Also post a message on the bus in these cases.wpe: Emit load-progress messages

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1875>
---
 ext/sbc/gstsbcenc.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'ext')

diff --git a/ext/sbc/gstsbcenc.c b/ext/sbc/gstsbcenc.c
index 8948df87c..d4f9b633c 100644
--- a/ext/sbc/gstsbcenc.c
+++ b/ext/sbc/gstsbcenc.c
@@ -288,8 +288,6 @@ gst_sbc_enc_handle_frame (GstAudioEncoder * audio_enc, GstBuffer * buffer)
       gst_buffer_replace (&outbuf, NULL);
   }
 
-done:
-
   gst_buffer_unmap (buffer, &in_map);
 
   return gst_audio_encoder_finish_frame (audio_enc, outbuf,
@@ -298,13 +296,16 @@ done:
 /* ERRORS */
 no_buffer:
   {
-    GST_ERROR_OBJECT (enc, "could not allocate output buffer");
-    goto done;
+    gst_buffer_unmap (buffer, &in_map);
+    GST_ELEMENT_ERROR (enc, STREAM, FAILED, (NULL),
+        ("Could not allocate output buffer"));
+    return GST_FLOW_ERROR;
   }
 map_failed:
   {
-    GST_ERROR_OBJECT (enc, "could not map input buffer");
-    goto done;
+    GST_ELEMENT_ERROR (enc, STREAM, FAILED, (NULL),
+        ("Could not allocate output buffer"));
+    return GST_FLOW_ERROR;
   }
 }
 
-- 
cgit v1.2.1