From d45658ba5a7e5dd8d8ae9e3b82b6c00d07bbd893 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Thu, 28 Nov 2013 16:51:37 +0100
Subject: [PATCH] plugins: drop obsolete functions.

Drop the following functions that are not longer used:
- gst_vaapi_video_buffer_new_with_surface()
- gst_vaapi_video_meta_new_with_surface()
- gst_vaapi_video_meta_set_surface()
- gst_vaapi_video_meta_set_surface_from_pool()
---
 gst/vaapi/gstvaapivideobuffer.c |  6 ---
 gst/vaapi/gstvaapivideobuffer.h |  4 --
 gst/vaapi/gstvaapivideometa.c   | 86 -----------------------------------------
 gst/vaapi/gstvaapivideometa.h   | 14 -------
 4 files changed, 110 deletions(-)

diff --git a/gst/vaapi/gstvaapivideobuffer.c b/gst/vaapi/gstvaapivideobuffer.c
index 760a765..597689a 100644
--- a/gst/vaapi/gstvaapivideobuffer.c
+++ b/gst/vaapi/gstvaapivideobuffer.c
@@ -340,12 +340,6 @@ gst_vaapi_video_buffer_new_with_image(GstVaapiImage *image)
 }
 
 GstBuffer *
-gst_vaapi_video_buffer_new_with_surface(GstVaapiSurface *surface)
-{
-    return new_vbuffer(gst_vaapi_video_meta_new_with_surface(surface));
-}
-
-GstBuffer *
 gst_vaapi_video_buffer_new_with_surface_proxy(GstVaapiSurfaceProxy *proxy)
 {
     return new_vbuffer(gst_vaapi_video_meta_new_with_surface_proxy(proxy));
diff --git a/gst/vaapi/gstvaapivideobuffer.h b/gst/vaapi/gstvaapivideobuffer.h
index dc8f174..e22b6e0 100644
--- a/gst/vaapi/gstvaapivideobuffer.h
+++ b/gst/vaapi/gstvaapivideobuffer.h
@@ -53,10 +53,6 @@ gst_vaapi_video_buffer_new_with_image(GstVaapiImage *image);
 
 G_GNUC_INTERNAL
 GstBuffer *
-gst_vaapi_video_buffer_new_with_surface(GstVaapiSurface *surface);
-
-G_GNUC_INTERNAL
-GstBuffer *
 gst_vaapi_video_buffer_new_with_surface_proxy(GstVaapiSurfaceProxy *proxy);
 
 G_END_DECLS
diff --git a/gst/vaapi/gstvaapivideometa.c b/gst/vaapi/gstvaapivideometa.c
index ce8c04d..3973b75 100644
--- a/gst/vaapi/gstvaapivideometa.c
+++ b/gst/vaapi/gstvaapivideometa.c
@@ -86,19 +86,6 @@ set_surface(GstVaapiVideoMeta *meta, GstVaapiSurface *surface)
 }
 
 static gboolean
-set_surface_from_pool(GstVaapiVideoMeta *meta, GstVaapiVideoPool *pool)
-{
-    GstVaapiSurface *surface;
-
-    surface = gst_vaapi_video_pool_get_object(pool);
-    if (!surface)
-        return FALSE;
-    set_surface(meta, surface);
-    meta->surface_pool = gst_vaapi_video_pool_ref(pool);
-    return TRUE;
-}
-
-static gboolean
 set_surface_proxy(GstVaapiVideoMeta *meta, GstVaapiSurfaceProxy *proxy)
 {
     GstVaapiSurface *surface;
@@ -372,33 +359,6 @@ gst_vaapi_video_meta_new_with_image(GstVaapiImage *image)
 }
 
 /**
- * gst_vaapi_video_meta_new_with_surface:
- * @surface: a #GstVaapiSurface
- *
- * Creates a #GstVaapiVideoMeta with the specified @surface. The resulting
- * meta holds an additional reference to the @surface.
- *
- * This function shall only be called from within gstreamer-vaapi
- * plugin elements.
- *
- * Return value: the newly allocated #GstVaapiVideoMeta, or %NULL on error
- */
-GstVaapiVideoMeta *
-gst_vaapi_video_meta_new_with_surface(GstVaapiSurface *surface)
-{
-    GstVaapiVideoMeta *meta;
-
-    g_return_val_if_fail(surface != NULL, NULL);
-
-    meta = _gst_vaapi_video_meta_new();
-    if (G_UNLIKELY(!meta))
-        return NULL;
-
-    gst_vaapi_video_meta_set_surface(meta, surface);
-    return meta;
-}
-
-/**
  * gst_vaapi_video_meta_new_with_surface_proxy:
  * @proxy: a #GstVaapiSurfaceProxy
  *
@@ -594,52 +554,6 @@ gst_vaapi_video_meta_get_surface(GstVaapiVideoMeta *meta)
 }
 
 /**
- * gst_vaapi_video_meta_set_surface:
- * @meta: a #GstVaapiVideoMeta
- * @surface: a #GstVaapiSurface
- *
- * Binds @surface to the @meta. If the @meta contains another
- * surface previously allocated from a pool, it's pushed back to its
- * parent pool and the pool is also released.
- */
-void
-gst_vaapi_video_meta_set_surface(GstVaapiVideoMeta *meta,
-    GstVaapiSurface *surface)
-{
-    g_return_if_fail(GST_VAAPI_IS_VIDEO_META(meta));
-
-    gst_vaapi_video_meta_destroy_surface(meta);
-
-    if (surface)
-        set_surface(meta, surface);
-}
-
-/**
- * gst_vaapi_video_meta_set_surface_from_pool
- * @meta: a #GstVaapiVideoMeta
- * @pool: a #GstVaapiVideoPool
- *
- * Binds a newly allocated video object from the @pool. The @pool
- * shall be of type #GstVaapiSurfacePool. Previously allocated objects
- * are released and returned to their parent pools, if any.
- *
- * Return value: %TRUE on success
- */
-gboolean
-gst_vaapi_video_meta_set_surface_from_pool(GstVaapiVideoMeta *meta,
-    GstVaapiVideoPool *pool)
-{
-    g_return_val_if_fail(GST_VAAPI_IS_VIDEO_META(meta), FALSE);
-    g_return_val_if_fail(pool != NULL, FALSE);
-    g_return_val_if_fail(gst_vaapi_video_pool_get_object_type(pool) ==
-        GST_VAAPI_VIDEO_POOL_OBJECT_TYPE_SURFACE, FALSE);
-
-    gst_vaapi_video_meta_destroy_surface(meta);
-
-    return set_surface_from_pool(meta, pool);
-}
-
-/**
  * gst_vaapi_video_meta_get_surface_proxy:
  * @meta: a #GstVaapiVideoMeta
  *
diff --git a/gst/vaapi/gstvaapivideometa.h b/gst/vaapi/gstvaapivideometa.h
index d436358..403dbdf 100644
--- a/gst/vaapi/gstvaapivideometa.h
+++ b/gst/vaapi/gstvaapivideometa.h
@@ -62,10 +62,6 @@ gst_vaapi_video_meta_new_with_image(GstVaapiImage *image);
 
 G_GNUC_INTERNAL
 GstVaapiVideoMeta *
-gst_vaapi_video_meta_new_with_surface(GstVaapiSurface *surface);
-
-G_GNUC_INTERNAL
-GstVaapiVideoMeta *
 gst_vaapi_video_meta_new_with_surface_proxy(GstVaapiSurfaceProxy *proxy);
 
 G_GNUC_INTERNAL
@@ -103,16 +99,6 @@ GstVaapiSurface *
 gst_vaapi_video_meta_get_surface(GstVaapiVideoMeta *meta);
 
 G_GNUC_INTERNAL
-void
-gst_vaapi_video_meta_set_surface(GstVaapiVideoMeta *meta,
-    GstVaapiSurface *surface);
-
-G_GNUC_INTERNAL
-gboolean
-gst_vaapi_video_meta_set_surface_from_pool(GstVaapiVideoMeta *meta,
-    GstVaapiVideoPool *pool);
-
-G_GNUC_INTERNAL
 GstVaapiSurfaceProxy *
 gst_vaapi_video_meta_get_surface_proxy(GstVaapiVideoMeta *meta);
 
-- 
2.7.4