From: Olivier Crête <olivier.crete@collabora.com>
Date: Fri, 11 Dec 2020 19:52:20 +0000 (-0500)
Subject: sbc/ldac: Don't use GST_CAPS_NONE to mean NULL
X-Git-Tag: 1.19.3~507^2~565
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98bd83484cb1f0c920da57acf2c7b661dd1ec2af;p=platform%2Fupstream%2Fgstreamer.git

sbc/ldac: Don't use GST_CAPS_NONE to mean NULL

The GST_CAPS_NONE macro actually returns a instance of
a empty caps.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1874>
---

diff --git a/ext/ldac/gstldacenc.c b/ext/ldac/gstldacenc.c
index 1820d3a..ec4c04f 100644
--- a/ext/ldac/gstldacenc.c
+++ b/ext/ldac/gstldacenc.c
@@ -197,11 +197,11 @@ gst_ldac_enc_do_negotiate (GstAudioEncoder * audio_enc)
 
   /* Negotiate output format based on downstream caps restrictions */
   caps = gst_pad_get_allowed_caps (GST_AUDIO_ENCODER_SRC_PAD (enc));
-  if (caps == GST_CAPS_NONE || gst_caps_is_empty (caps))
-    goto failure;
 
   if (caps == NULL)
     caps = gst_static_pad_template_get_caps (&ldac_enc_src_factory);
+  else if (gst_caps_is_empty (caps))
+    goto failure;
 
   /* Fixate output caps */
   filter_caps = gst_caps_new_simple ("audio/x-ldac", "rate", G_TYPE_INT,
diff --git a/ext/sbc/gstsbcenc.c b/ext/sbc/gstsbcenc.c
index 6dae1bf..8948df8 100644
--- a/ext/sbc/gstsbcenc.c
+++ b/ext/sbc/gstsbcenc.c
@@ -89,11 +89,11 @@ gst_sbc_enc_set_format (GstAudioEncoder * audio_enc, GstAudioInfo * info)
 
   /* negotiate output format based on downstream caps restrictions */
   caps = gst_pad_get_allowed_caps (GST_AUDIO_ENCODER_SRC_PAD (enc));
-  if (caps == GST_CAPS_NONE || gst_caps_is_empty (caps))
-    goto failure;
 
   if (caps == NULL)
     caps = gst_static_pad_template_get_caps (&sbc_enc_src_factory);
+  else if (gst_caps_is_empty (caps))
+    goto failure;
 
   /* fixate output caps */
   filter_caps = gst_caps_new_simple ("audio/x-sbc", "rate", G_TYPE_INT,