From fe07763fd8658b71d19f9f43cd56f13dd7dca758 Mon Sep 17 00:00:00 2001 From: He Junyan Date: Thu, 25 May 2023 10:41:21 +0800 Subject: [PATCH] glupload: make raw manner only consider system memory The current _raw_data_upload_transform_caps() only simply apply "memory:GLMemory" to all input caps to transform the output caps. This is not precise and may cause problem. For example, if the input caps include: video/x-raw(memory:DMABuf), width=(int)1920, height=(int)1080, \ interlace-mode=(string)progressive, multiview-mode=(string)mono, \ framerate=(fraction)30/1, drm-format=(string)NV12:0x0100000000000002 it will be changed as video/x-raw(memory:GLMemory), width=(int)1920, height=(int)1080, \ interlace-mode=(string)progressive, multiview-mode=(string)mono, \ framerate=(fraction)30/1, drm-format=(string)NV12:0x0100000000000002 For GLMemory kind caps, no drm-format should appear. So we should let it only transforms which it can recognize. We also should recognize the system memory caps in _accept() early, if the input is not system memory, we just return early. Part-of: --- .../gst-libs/gst/gl/gstglupload.c | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 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 e4e23f716b..7555b4a699 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c @@ -2083,11 +2083,21 @@ _raw_data_upload_transform_caps (gpointer impl, GstGLContext * context, if (direction == GST_PAD_SINK) { GstGLTextureTarget target_mask = 0; + GstCapsFeatures *filter_features; GstCaps *tmp; - ret = - _set_caps_features_with_passthrough (caps, + filter_features = + gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY); + if (!_filter_caps_with_features (caps, filter_features, &tmp)) { + gst_caps_features_free (filter_features); + gst_caps_features_free (passthrough); + return NULL; + } + gst_caps_features_free (filter_features); + + ret = _set_caps_features_with_passthrough (tmp, GST_CAPS_FEATURE_MEMORY_GL_MEMORY, passthrough); + gst_caps_unref (tmp); target_mask |= 1 << GST_GL_TEXTURE_TARGET_2D; target_mask |= 1 << GST_GL_TEXTURE_TARGET_RECTANGLE; @@ -2121,6 +2131,16 @@ _raw_data_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps, struct RawUpload *raw = impl; GstCapsFeatures *features; + features = + gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY); + /* Also consider the omited system memory feature cases, such as + video/x-raw(meta:GstVideoOverlayComposition) */ + if (!_filter_caps_with_features (in_caps, features, NULL)) { + gst_caps_features_free (features); + return FALSE; + } + gst_caps_features_free (features); + features = gst_caps_get_features (out_caps, 0); if (!gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) return FALSE;