Revert "glupload: allow system memory for dmabuf in transform_caps"
authorJan Schmidt <jan@centricular.com>
Thu, 30 Jun 2022 02:46:31 +0000 (12:46 +1000)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Thu, 30 Jun 2022 08:52:04 +0000 (08:52 +0000)
This reverts commit f3292dc1561a8d62812c3f1a2bb3de5c5bb6a807.

Only the raw data uploader should add sysmem caps to the
actual caps query, because we want them to be at the
lowest priority. If upstream does select to send raw
caps, then the correct upload method will still
be chosen because the accept_caps implementation
will accept them

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

subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c

index e2cd82d59bf517d374b5c46e5645cdd5724f0310..8cd09f64bbee6c1e2d008e1a5123f777b42948c8 100644 (file)
@@ -554,15 +554,10 @@ _dma_buf_upload_transform_caps (gpointer impl, GstGLContext * context,
     ret = tmp;
   } else {
     gint i, n;
-    GstCaps *tmp;
 
     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);
 
     n = gst_caps_get_size (ret);
     for (i = 0; i < n; i++) {