From f180fe8dc8f77289cba2a00960c74e9f9def8ef8 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 3 Feb 2015 00:35:26 +1100 Subject: [PATCH] glupload: only try the glmemory upload for sysmem/glmemory caps features Allows selecting/testing the upload path with explicit caps features. --- gst-libs/gst/gl/gstglupload.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c index 0eb54fc1c3..2be2f6a128 100644 --- a/gst-libs/gst/gl/gstglupload.c +++ b/gst-libs/gst/gl/gstglupload.c @@ -155,6 +155,12 @@ _gl_memory_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps, if (!gst_caps_features_is_equal (features, gl_features)) ret = FALSE; + features = gst_caps_get_features (in_caps, 0); + if (!gst_caps_features_is_equal (features, gl_features) + && !gst_caps_features_is_equal (features, + GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)) + ret = FALSE; + gst_caps_features_free (gl_features); if (!ret)