summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-07-05 15:17:30 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-10-30 12:25:08 +0100
commitf3292dc1561a8d62812c3f1a2bb3de5c5bb6a807 (patch)
tree035e3698f148eead5aa1a15eb86613b83eb14fa1
parent4d9abc6bed66593438e378d8648fc067d9aa1615 (diff)
downloadgst-plugins-base-f3292dc1561a8d62812c3f1a2bb3de5c5bb6a807.tar.gz
gst-plugins-base-f3292dc1561a8d62812c3f1a2bb3de5c5bb6a807.tar.xz
glupload: allow system memory for dmabuf in transform_caps
This should not be necessary, but currently not all plugins that provide dmabuf memory announce this with caps features, e.g. v4l2. The static caps already contain the system memory. It didn't break before because other upload methods provide the necessary transformation. https://bugzilla.gnome.org/show_bug.cgi?id=783521
-rw-r--r--gst-libs/gst/gl/gstglupload.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c
index 81e7f61a1..9df6c2afe 100644
--- a/gst-libs/gst/gl/gstglupload.c
+++ b/gst-libs/gst/gl/gstglupload.c
@@ -536,10 +536,16 @@ _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++) {