From 3024640d4f7b0dd5450e99e8c0ec3dcda9c48a8d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Fri, 8 May 2015 15:54:09 +0200 Subject: [PATCH] plugins: remove gstreamer-0.10 crumbs GstVideoContext was used in gstreamer-0.10, which is not supported anymore. Still, its definition was still in the code. This patch removes it. https://bugzilla.gnome.org/show_bug.cgi?id=749113 --- gst/vaapi/gstvaapipluginbase.c | 3 ++- gst/vaapi/gstvaapipluginutil.c | 12 ++++-------- gst/vaapi/gstvaapipluginutil.h | 2 +- gst/vaapi/gstvaapivideocontext.h | 6 ------ 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/gst/vaapi/gstvaapipluginbase.c b/gst/vaapi/gstvaapipluginbase.c index d29e817..e4f1c58 100644 --- a/gst/vaapi/gstvaapipluginbase.c +++ b/gst/vaapi/gstvaapipluginbase.c @@ -333,7 +333,8 @@ gst_vaapi_plugin_base_ensure_display (GstVaapiPluginBase * plugin) return TRUE; gst_vaapi_display_replace (&plugin->display, NULL); - if (!gst_vaapi_ensure_display (plugin, plugin->display_type_req)) + if (!gst_vaapi_ensure_display (GST_ELEMENT (plugin), + plugin->display_type_req)) return FALSE; plugin->display_type = gst_vaapi_display_get_display_type (plugin->display); diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c index cb49060..64bc3ba 100644 --- a/gst/vaapi/gstvaapipluginutil.c +++ b/gst/vaapi/gstvaapipluginutil.c @@ -247,18 +247,14 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object) } gboolean -gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type) +gst_vaapi_ensure_display (GstElement * element, GstVaapiDisplayType type) { GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element); GstVaapiDisplay *display; - GstVideoContext *context; - g_return_val_if_fail (GST_IS_VIDEO_CONTEXT (element), FALSE); + g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE); - context = GST_VIDEO_CONTEXT (element); - g_return_val_if_fail (context != NULL, FALSE); - - gst_vaapi_video_context_prepare (context, display_types); + gst_vaapi_video_context_prepare (element, display_types); /* Neighbour found and it updated the display */ if (gst_vaapi_plugin_base_has_display_type (plugin, type)) @@ -272,7 +268,7 @@ gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type) if (!display) return FALSE; - gst_vaapi_video_context_propagate (context, display); + gst_vaapi_video_context_propagate (element, display); GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE (plugin, display); gst_vaapi_display_unref (display); return TRUE; diff --git a/gst/vaapi/gstvaapipluginutil.h b/gst/vaapi/gstvaapipluginutil.h index 0209d08..5b437c7 100644 --- a/gst/vaapi/gstvaapipluginutil.h +++ b/gst/vaapi/gstvaapipluginutil.h @@ -31,7 +31,7 @@ G_GNUC_INTERNAL gboolean -gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type); +gst_vaapi_ensure_display (GstElement * element, GstVaapiDisplayType type); G_GNUC_INTERNAL gboolean diff --git a/gst/vaapi/gstvaapivideocontext.h b/gst/vaapi/gstvaapivideocontext.h index 0c8797e..1f052be 100644 --- a/gst/vaapi/gstvaapivideocontext.h +++ b/gst/vaapi/gstvaapivideocontext.h @@ -31,12 +31,6 @@ #define GST_VAAPI_DISPLAY_CONTEXT_TYPE_NAME "gst.vaapi.Display" -/* Fake GstVideoContext symbols */ -#define GST_VIDEO_CONTEXT(obj) (GST_ELEMENT (obj)) -#define GST_IS_VIDEO_CONTEXT(obj) (GST_IS_ELEMENT (obj)) -#define GstVideoContext GstElement -#define gst_video_context_prepare gst_vaapi_video_context_prepare - G_GNUC_INTERNAL GstContext * gst_vaapi_video_context_new_with_display (GstVaapiDisplay * display, -- 2.7.4