mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 07:38:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: GstGL API must use the member variables

Browse source 
This commit basically is a revert of commits 8092537 and fc1c415

https://bugzilla.gnome.org/show_bug.cgi?id=793643
This commit is contained in:
Víctor Manuel Jáquez Leal 2018-04-26 15:03:23 +02:00
parent b9c38a295b
commit 86bf89d16d
1 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/vaapi/gstvaapipluginbase.c
View file

@ -60,21 +60,6 @@ plugin_set_display (GstVaapiPluginBase * plugin, GstVaapiDisplay * display)
gst_vaapi_display_unref (display); gst_vaapi_display_unref (display);
} }
#if USE_GST_GL_HELPERS
static void
plugin_set_gst_gl (GstVaapiPluginBase * plugin, GstGLDisplay * gl_display,
GstGLContext * gl_context, GstGLContext * gl_other_context)
{
gst_object_replace (&plugin->gl_display, NULL);
plugin->gl_display = (GstObject *) gl_display;
gst_object_replace (&plugin->gl_context, (GstObject *) gl_context);
gst_object_replace (&plugin->gl_other_context, NULL);
plugin->gl_other_context = (GstObject *) gl_other_context;
}
#endif
/** /**
* gst_vaapi_plugin_base_set_context: * gst_vaapi_plugin_base_set_context:
* @plugin: a #GstVaapiPluginBase instance * @plugin: a #GstVaapiPluginBase instance
@ -99,14 +84,9 @@ gst_vaapi_plugin_base_set_context (GstVaapiPluginBase * plugin,
plugin_set_display (plugin, display); plugin_set_display (plugin, display);
} }
#if USE_GST_GL_HELPERS #if USE_GST_GL_HELPERS
{ gst_gl_handle_set_context (GST_ELEMENT_CAST (plugin), context,
GstGLDisplay *gl_display = NULL; (GstGLDisplay **) & plugin->gl_display,
GstGLContext *gl_other_context = NULL; (GstGLContext **) & plugin->gl_other_context);
GstElement *el = GST_ELEMENT_CAST (plugin);
if (gst_gl_handle_set_context (el, context, &gl_display, &gl_other_context))
plugin_set_gst_gl (plugin, gl_display, NULL, gl_other_context);
}
#endif #endif
} }