summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2018-04-26 15:03:23 +0200
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2018-04-27 12:44:58 +0200
commit978dd3afd5bed9f6e853e2c4178c41f275703547 (patch)
treef33805ce78c1850d2cacdfdf19198442f816fde5
parenta42ff804c77cbe7fa7ce79be86befce5fe6df49e (diff)
plugins: GstGL API must use the member variables
This commit basically is a revert of commits 8092537 and fc1c415 https://bugzilla.gnome.org/show_bug.cgi?id=793643
-rw-r--r--gst/vaapi/gstvaapipluginbase.c26
1 files changed, 3 insertions, 23 deletions
diff --git a/gst/vaapi/gstvaapipluginbase.c b/gst/vaapi/gstvaapipluginbase.c
index 5fde56c4..18c35767 100644
--- a/gst/vaapi/gstvaapipluginbase.c
+++ b/gst/vaapi/gstvaapipluginbase.c
@@ -60,21 +60,6 @@ plugin_set_display (GstVaapiPluginBase * plugin, GstVaapiDisplay * 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:
* @plugin: a #GstVaapiPluginBase instance
@@ -99,14 +84,9 @@ gst_vaapi_plugin_base_set_context (GstVaapiPluginBase * plugin,
plugin_set_display (plugin, display);
}
#if USE_GST_GL_HELPERS
- {
- GstGLDisplay *gl_display = NULL;
- GstGLContext *gl_other_context = NULL;
- 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);
- }
+ gst_gl_handle_set_context (GST_ELEMENT_CAST (plugin), context,
+ (GstGLDisplay **) & plugin->gl_display,
+ (GstGLContext **) & plugin->gl_other_context);
#endif
}