mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: pass members as parameters of gst_gl_ensure_element_data()

Browse source 
The parameters of gst_gl_ensure_element_data() have to be not
local variable since they are going to be used to see if they're
set in gst_element_set_context() inside the API.

This is basically a revert of commit 3d56306c

https://bugzilla.gnome.org/show_bug.cgi?id=793643
This commit is contained in:
Hyunjun Ko 2018-04-25 16:24:32 +09:00 committed by Víctor Manuel Jáquez Leal
parent 785efdbc22
commit b9c38a295b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/vaapi/gstvaapipluginbase.c
View file

@ -1235,11 +1235,15 @@ gst_vaapi_plugin_base_create_gl_context (GstVaapiPluginBase * plugin)
GstGLContext *gl_other_context = NULL, *gl_context = NULL; GstGLContext *gl_other_context = NULL, *gl_context = NULL;
GstGLDisplay *gl_display = NULL; GstGLDisplay *gl_display = NULL;
if (!gst_gl_ensure_element_data (plugin, &gl_display, &gl_other_context)) if (!gst_gl_ensure_element_data (plugin,
(GstGLDisplay **) & plugin->gl_display,
(GstGLContext **) & plugin->gl_other_context))
goto no_valid_gl_display; goto no_valid_gl_display;
gl_display = (GstGLDisplay *) plugin->gl_display;
if (gst_gl_display_get_handle_type (gl_display) == GST_GL_DISPLAY_TYPE_ANY) if (gst_gl_display_get_handle_type (gl_display) == GST_GL_DISPLAY_TYPE_ANY)
goto no_valid_gl_display; goto no_valid_gl_display;
gl_other_context = (GstGLContext *) plugin->gl_other_context;
GST_INFO_OBJECT (plugin, "creating a new GstGL context"); GST_INFO_OBJECT (plugin, "creating a new GstGL context");
@ -1256,15 +1260,14 @@ gst_vaapi_plugin_base_create_gl_context (GstVaapiPluginBase * plugin)
} while (!gst_gl_display_add_context (gl_display, gl_context)); } while (!gst_gl_display_add_context (gl_display, gl_context));
GST_OBJECT_UNLOCK (gl_display); GST_OBJECT_UNLOCK (gl_display);
plugin_set_gst_gl (plugin, gl_display, gl_context, gl_other_context);
return GST_OBJECT_CAST (gl_context); return GST_OBJECT_CAST (gl_context);
/* ERRORS */ /* ERRORS */
no_valid_gl_display: no_valid_gl_display:
{ {
gst_object_replace ((GstObject **) & gl_display, NULL); GST_INFO_OBJECT (plugin, "No valid GL display found");
gst_object_replace ((GstObject **) & gl_other_context, NULL); gst_object_replace (&plugin->gl_display, NULL);
gst_object_replace (&plugin->gl_other_context, NULL);
return NULL; return NULL;
} }
#else #else