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: set GL objects if ensured

Browse source 
Only set the GL display and GL other context if they are ensured.

https://bugzilla.gnome.org/show_bug.cgi?id=773453
This commit is contained in:
Víctor Manuel Jáquez Leal 2017-10-10 19:13:35 +02:00
parent fc1c415515
commit 3d56306c37
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/vaapi/gstvaapipluginbase.c
View file

@ -1219,18 +1219,14 @@ GstObject *
gst_vaapi_plugin_base_create_gl_context (GstVaapiPluginBase * plugin)
{
#if USE_GST_GL_HELPERS
GstGLContext *gl_other_context, *gl_context = NULL;
GstGLDisplay *gl_display;
GstGLContext *gl_other_context = NULL, *gl_context = NULL;
GstGLDisplay *gl_display = NULL;
if (!gst_gl_ensure_element_data (plugin,
(GstGLDisplay **) & plugin->gl_display,
(GstGLContext **) & plugin->gl_other_context))
if (!gst_gl_ensure_element_data (plugin, &gl_display, &gl_other_context))
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)
goto no_valid_gl_display;
gl_other_context = (GstGLContext *) plugin->gl_other_context;
GST_INFO_OBJECT (plugin, "creating a new GstGL context");
@ -1247,6 +1243,8 @@ gst_vaapi_plugin_base_create_gl_context (GstVaapiPluginBase * plugin)
} while (!gst_gl_display_add_context (gl_display, gl_context));
GST_OBJECT_UNLOCK (gl_display);
plugin->gl_display = (GstObject *) gl_display;
plugin->gl_other_context = (GstObject *) gl_context;
gst_object_replace (&plugin->gl_context, (GstObject *) gl_context);
return GST_OBJECT_CAST (gl_context);
@ -1254,8 +1252,8 @@ gst_vaapi_plugin_base_create_gl_context (GstVaapiPluginBase * plugin)
/* ERRORS */
no_valid_gl_display:
{
gst_object_replace (&plugin->gl_display, NULL);
gst_object_replace (&plugin->gl_other_context, NULL);
gst_object_replace ((GstObject **) & gl_display, NULL);
gst_object_replace ((GstObject **) & gl_other_context, NULL);
return NULL;
}
#else