From f8541b05aa59b75cb64028a1afacb831a2ebefb9 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 7 Jul 2022 23:54:44 +1000 Subject: [PATCH] gstglupload: Remove raw caps from individual methods Raw memory upload should always be the least preferred input caps, only added by the raw memory uploader as the last thing in the caps. Caps negotiation should still choose raw data when it needs to, and other upload methods that can accept raw data buffers will still do so. Part-of: --- .../gst-plugins-base/gst-libs/gst/gl/gstglupload.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c index 8cd09f64bb..16e1fe8f55 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c @@ -907,10 +907,6 @@ _direct_dma_buf_upload_transform_caps (gpointer impl, GstGLContext * context, ret = _set_caps_features_with_passthrough (caps, GST_CAPS_FEATURE_MEMORY_DMABUF, passthrough); - tmp = - _set_caps_features_with_passthrough (caps, - GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, passthrough); - gst_caps_append (ret, tmp); g_value_init (&formats, GST_TYPE_LIST); gst_value_deserialize (&formats, format_str); @@ -1497,13 +1493,8 @@ _directviv_upload_transform_caps (gpointer impl, GstGLContext * context, gst_caps_unref (ret); ret = tmp; } else { - GstCaps *tmp; - tmp = gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES + ret = gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, GST_GL_DIRECTVIV_FORMAT)); - ret = - _set_caps_features_with_passthrough (tmp, - GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, passthrough); - gst_caps_unref (tmp); } gst_caps_features_free (passthrough);