mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "glupload: Fix caps query with no filter"

Browse source 
This reverts commit 6f9ae5d758.

The _transform_caps() function can't tell the difference
between the caller wanting to know the output caps
for the current method, or all possible output caps. If
it includes caps for all possible methods, glupload can
end up negotiating and sending the wrong output caps
downstream.

Partially reverts !2687
Fixes #1310

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2699>
This commit is contained in:
Jan Schmidt 2022-07-01 23:57:08 +10:00
parent 2aae64edb9
commit 79d8b435d7
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2358,12 +2358,7 @@ gst_gl_upload_transform_caps (GstGLUpload * upload, GstGLContext * context,
GstCaps *result, *tmp;
gint i;
/* If (and only if) there is an upstream filter, we can
* save some time by first checking if the configured upload method
* generates intersecting caps. If there's no filter, or no
* intersection we need to generate a full set of caps from all
* uploaders for upstream to choose from */
if (upload->priv->method && filter != NULL) {
if (upload->priv->method) {
tmp = upload->priv->method->transform_caps (upload->priv->method_impl,
context, direction, caps);
if (tmp) {