From 593dc0356cfa4607f35e772b96ed6e19bd64b269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 25 Feb 2025 12:52:19 +0200 Subject: [PATCH] Revert "glupload: Add formats supported by #GstGLMemory to raw caps when generating sink pad caps" This reverts commit cf30e875de7b8f04730753fb35869d0f7338b6e5. This broke caps negotiation on Wayland/EGL with: videotestsrc ! glupload ! glimagesinkelement Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4240 Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c | 5 ++--- 1 file changed, 2 insertions(+), 3 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 1eb657d8d7..562cee0e12 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c @@ -1482,12 +1482,11 @@ _direct_dma_buf_upload_transform_caps (gpointer impl, GstGLContext * context, ret = _dma_buf_upload_transform_caps_common (tmp_caps, context, direction, flags, 1 << dmabuf->target, GST_CAPS_FEATURE_MEMORY_GL_MEMORY, GST_CAPS_FEATURE_MEMORY_DMABUF); + gst_caps_unref (tmp_caps); - - tmp = _dma_buf_upload_transform_caps_common (tmp_caps, context, direction, + tmp = _dma_buf_upload_transform_caps_common (caps, context, direction, flags, 1 << dmabuf->target, GST_CAPS_FEATURE_MEMORY_GL_MEMORY, GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY); - gst_caps_unref (tmp_caps); if (!ret) { ret = tmp;