From: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Date: Tue, 16 Nov 2021 09:40:03 +0000 (+0100)
Subject: vapostproc: Append featured caps rather than merge.
X-Git-Tag: 1.20.0~254
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68379649db122e1d143e2f700edc81224500c2ab;p=platform%2Fupstream%2Fgstreamer.git

vapostproc: Append featured caps rather than merge.

So it would be possible to honor upstream preference.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1369>
---

diff --git a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
index 42f14c1..6540a17 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
@@ -893,14 +893,17 @@ gst_va_vpp_transform_caps (GstBaseTransform * trans, GstPadDirection direction,
   ret = gst_va_vpp_caps_remove_fields (caps);
 
   tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_VA);
-  ret = gst_caps_merge (ret, tmp);
+  if (!gst_caps_is_subset (tmp, ret))
+    gst_caps_append (ret, tmp);
 
   tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_DMABUF);
-  ret = gst_caps_merge (ret, tmp);
+  if (!gst_caps_is_subset (tmp, ret))
+    gst_caps_append (ret, tmp);
 
   tmp = gst_va_vpp_complete_caps_features (ret,
       GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
-  ret = gst_caps_merge (ret, tmp);
+  if (!gst_caps_is_subset (tmp, ret))
+    gst_caps_append (ret, tmp);
 
   if (filter) {
     GstCaps *intersection;