From: He Junyan <junyan.he@hotmail.com>
Date: Sun, 15 Mar 2020 13:50:24 +0000 (+0800)
Subject: plugin: bufferpool: Delete ACQUIRE_FLAG_NO_ALLOC flag.
X-Git-Tag: 1.19.3~503^2~211
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7701844813e9c1ed559a0014cfa29986d907ae09;p=platform%2Fupstream%2Fgstreamer.git

plugin: bufferpool: Delete ACQUIRE_FLAG_NO_ALLOC flag.

Delete the GST_VAAPI_VIDEO_BUFFER_POOL_ACQUIRE_FLAG_NO_ALLOC flag.
In fact, no one is using that flag, and all vaapi buffers should
have GstVaapiVideoMeta.
---

diff --git a/gst/vaapi/gstvaapivideobufferpool.c b/gst/vaapi/gstvaapivideobufferpool.c
index 2de92ea..874dbcb 100644
--- a/gst/vaapi/gstvaapivideobufferpool.c
+++ b/gst/vaapi/gstvaapivideobufferpool.c
@@ -321,22 +321,15 @@ gst_vaapi_video_buffer_pool_alloc_buffer (GstBufferPool * pool,
   GstMemory *mem;
   GstBuffer *buffer;
 
-  const gboolean alloc_vaapi_video_meta = !params ||
-      !(params->flags & GST_VAAPI_VIDEO_BUFFER_POOL_ACQUIRE_FLAG_NO_ALLOC);
-
   if (!priv->allocator)
     goto error_no_allocator;
 
-  if (alloc_vaapi_video_meta) {
-    meta = gst_vaapi_video_meta_new (priv->display);
-    if (!meta)
-      goto error_create_meta;
+  meta = gst_vaapi_video_meta_new (priv->display);
+  if (!meta)
+    goto error_create_meta;
+
+  buffer = gst_vaapi_video_buffer_new (meta);
 
-    buffer = gst_vaapi_video_buffer_new (meta);
-  } else {
-    meta = NULL;
-    buffer = gst_vaapi_video_buffer_new_empty ();
-  }
   if (!buffer)
     goto error_create_buffer;
 
@@ -487,8 +480,8 @@ gst_vaapi_video_buffer_pool_reset_buffer (GstBufferPool * pool,
      * While surface is passed, we should clear it to avoid wrong
      * reference. */
     meta = gst_buffer_get_vaapi_video_meta (buffer);
-    if (meta)
-      gst_vaapi_video_meta_set_surface_proxy (meta, NULL);
+    g_assert (meta);
+    gst_vaapi_video_meta_set_surface_proxy (meta, NULL);
   }
 
   GST_BUFFER_POOL_CLASS (gst_vaapi_video_buffer_pool_parent_class)->reset_buffer
diff --git a/gst/vaapi/gstvaapivideobufferpool.h b/gst/vaapi/gstvaapivideobufferpool.h
index 98be6f8..23321fc 100644
--- a/gst/vaapi/gstvaapivideobufferpool.h
+++ b/gst/vaapi/gstvaapivideobufferpool.h
@@ -57,20 +57,6 @@ typedef struct _GstVaapiVideoBufferPoolPrivate GstVaapiVideoBufferPoolPrivate;
   "GstBufferPoolOptionVaapiVideoMeta"
 
 /**
- * GstVaapiVideoBufferPoolAcquireFlags:
- * @GST_VAAPI_VIDEO_BUFFER_POOL_ACQUIRE_FLAG_NO_ALLOC: option to
- *   request that vaapi video metadata are not initially allocated,
- *   but are subsequently provided by the user.
- *
- * The set of #GstVaapiVideoBufferPool specific flags for
- * gst_buffer_pool_acquire_buffer().
- */
-typedef enum {
-  GST_VAAPI_VIDEO_BUFFER_POOL_ACQUIRE_FLAG_NO_ALLOC =
-      GST_BUFFER_POOL_ACQUIRE_FLAG_LAST << 0,
-} GstVaapiVideoBufferPoolAcquireFlags;
-
-/**
  * GstVaapiVideoBufferPoolOption:
  * @GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META:
  * @GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT: