FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

glupload: Fix for wrongly recognized reconfigure condition

Browse Source 
gst_gl_upload_transform_caps() method might return non-fixed
caps (texture-target for example) but priv->out_caps is fixed one
so the former (non-fixed caps) is superset.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8492>
This commit is contained in:
Seungha Yang 2020-09-25 21:06:44 +09:00 committed by GStreamer Marge Bot
parent 7ef98ba41d
commit a3c45f2848
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c
View File

@ -3332,7 +3332,7 @@ restart:
last_method != NULL ? last_method->name : "None", last_method != NULL ? last_method->name : "None",
upload->priv->method->name, caps, upload->priv->out_caps); upload->priv->method->name, caps, upload->priv->out_caps);
if (caps == NULL || !gst_caps_is_subset (caps, upload->priv->out_caps)) { if (caps == NULL || !gst_caps_is_subset (upload->priv->out_caps, caps)) {
gst_buffer_replace (&outbuf, NULL); gst_buffer_replace (&outbuf, NULL);
ret = GST_GL_UPLOAD_RECONFIGURE; ret = GST_GL_UPLOAD_RECONFIGURE;
} }

2
subprojects/gst-plugins-base/tests/check/libs/gstglupload.c
View File

@ -283,7 +283,7 @@ GST_START_TEST (test_upload_data)
in_caps = gst_caps_from_string ("video/x-raw,format=RGBA," in_caps = gst_caps_from_string ("video/x-raw,format=RGBA,"
"width=10,height=10"); "width=10,height=10");
out_caps = gst_caps_from_string ("video/x-raw(memory:GLMemory)," out_caps = gst_caps_from_string ("video/x-raw(memory:GLMemory),"
"format=RGBA,width=10,height=10"); "format=RGBA,width=10,height=10,texture-target=2D");
gst_gl_upload_set_caps (upload, in_caps, out_caps); gst_gl_upload_set_caps (upload, in_caps, out_caps);