mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-18 05:16:05 +00:00
glupload: handle upload methods with different caps
If a upload method is selected then use it exclusively in transform_caps(). Also, reconfigure if the current caps don't match the current upload method. https://bugzilla.gnome.org/show_bug.cgi?id=783521
This commit is contained in:
parent
d7eb48cce7
commit
87336b1957
1 changed files with 13 additions and 0 deletions
|
@ -1662,6 +1662,10 @@ gst_gl_upload_transform_caps (GstGLUpload * upload, GstGLContext * context,
|
||||||
GstCaps *result, *tmp;
|
GstCaps *result, *tmp;
|
||||||
gint i;
|
gint i;
|
||||||
|
|
||||||
|
if (upload->priv->method)
|
||||||
|
return upload->priv->method->transform_caps (upload->priv->method_impl,
|
||||||
|
context, direction, caps);
|
||||||
|
|
||||||
tmp = gst_caps_new_empty ();
|
tmp = gst_caps_new_empty ();
|
||||||
|
|
||||||
for (i = 0; i < G_N_ELEMENTS (upload_methods); i++) {
|
for (i = 0; i < G_N_ELEMENTS (upload_methods); i++) {
|
||||||
|
@ -1849,6 +1853,15 @@ restart:
|
||||||
}
|
}
|
||||||
goto restart;
|
goto restart;
|
||||||
} else if (ret == GST_GL_UPLOAD_DONE || ret == GST_GL_UPLOAD_RECONFIGURE) {
|
} else if (ret == GST_GL_UPLOAD_DONE || ret == GST_GL_UPLOAD_RECONFIGURE) {
|
||||||
|
if (last_impl != upload->priv->method_impl) {
|
||||||
|
GstCaps *caps = gst_gl_upload_transform_caps (upload, upload->context,
|
||||||
|
GST_PAD_SINK, upload->priv->in_caps, NULL);
|
||||||
|
if (!gst_caps_is_equal (upload->priv->out_caps, caps)) {
|
||||||
|
gst_buffer_replace (&outbuf, NULL);
|
||||||
|
ret = GST_GL_UPLOAD_RECONFIGURE;
|
||||||
|
}
|
||||||
|
gst_caps_unref (caps);
|
||||||
|
}
|
||||||
/* we are done */
|
/* we are done */
|
||||||
} else {
|
} else {
|
||||||
upload->priv->method_impl = NULL;
|
upload->priv->method_impl = NULL;
|
||||||
|
|
Loading…
Reference in a new issue