From de0e4b8fd6635ff8f18302767ab995430635421e Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 30 Jun 2022 12:46:31 +1000 Subject: [PATCH] Revert "glupload: allow system memory for dmabuf in transform_caps" 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: --- subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c | 5 ----- 1 file changed, 5 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 e2cd82d..8cd09f6 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c @@ -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++) { -- 2.7.4