mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-18 00:12:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'glupload_transform_caps' into 'main'

Browse source 
gl: upload: Return all possible caps on transform_caps when filter is NULL or ANY

See merge request gstreamer/gstreamer!4412
This commit is contained in:
Thibault Saunier 2024-05-03 19:45:47 +00:00
parent 66c1383051 17e7a78e70
commit a84ec8b700
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c
View file

@ -3336,7 +3336,7 @@ gst_gl_upload_transform_caps (GstGLUpload * upload, GstGLContext * context,
GstCaps *result, *tmp;
gint i;
if (upload->priv->method) {
if (upload->priv->method && filter && !gst_caps_is_any (filter)) {
tmp = upload->priv->method->transform_caps (upload->priv->method_impl,
context, direction, caps);
@ -3354,13 +3354,7 @@ gst_gl_upload_transform_caps (GstGLUpload * upload, GstGLContext * context,
gst_caps_features_free (passthrough);
}
if (filter) {
result =
gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (tmp);
} else {
result = tmp;
}
result = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
if (!gst_caps_is_empty (result))
return result;
else