mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "glupload: handle upload methods with different caps"

Browse source 
This reverts commit 87336b1957.
This commit is contained in:
Nicolas Dufresne 2018-09-13 20:02:40 -04:00
parent 4a72dada3a
commit da30327b94
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/gl/gstglupload.c
View file

@ -1662,10 +1662,6 @@ 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++) {
@ -1853,15 +1849,6 @@ 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;