From 6b04c8ee56f903d7986005ba17e9bf0de7c0c4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Thu, 12 Jan 2023 17:15:12 +0100 Subject: [PATCH] vulkan: imagebufferpool: Remove video meta handling. Remove video meta handling since it's not used at all, also removed its usage in vkvideofilter. Part-of: --- .../gst-libs/gst/vulkan/gstvkimagebufferpool.c | 18 ------------------ .../gst-libs/gst/vulkan/gstvkvideofilter.c | 1 - 2 files changed, 19 deletions(-) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkimagebufferpool.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkimagebufferpool.c index 4c2235da64..17c1df4776 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkimagebufferpool.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkimagebufferpool.c @@ -33,9 +33,6 @@ * a #GstVulkanImageBufferPool is an object that allocates buffers with #GstVulkanImageMemory * * A #GstVulkanImageBufferPool is created with gst_vulkan_image_buffer_pool_new() - * - * #GstVulkanImageBufferPool implements the VideoMeta buffer pool option - * #GST_BUFFER_POOL_OPTION_VIDEO_META */ /* bufferpool */ @@ -44,7 +41,6 @@ struct _GstVulkanImageBufferPoolPrivate GstCaps *caps; gboolean raw_caps; GstVideoInfo v_info; - gboolean add_videometa; }; static void gst_vulkan_image_buffer_pool_finalize (GObject * object); @@ -60,16 +56,6 @@ G_DEFINE_TYPE_WITH_CODE (GstVulkanImageBufferPool, gst_vulkan_image_buffer_pool, GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_IMAGE_BUFFER_POOL, "vulkanimagebufferpool", 0, "Vulkan Image Buffer Pool")); -static const gchar ** -gst_vulkan_image_buffer_pool_get_options (GstBufferPool * pool) -{ - static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, - NULL - }; - - return options; -} - static gboolean gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) @@ -130,9 +116,6 @@ gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool, gst_memory_unref (GST_MEMORY_CAST (img_mem)); } - priv->add_videometa = gst_buffer_pool_config_has_option (config, - GST_BUFFER_POOL_OPTION_VIDEO_META); - gst_buffer_pool_config_set_params (config, caps, priv->v_info.size, min_buffers, max_buffers); @@ -245,7 +228,6 @@ gst_vulkan_image_buffer_pool_class_init (GstVulkanImageBufferPoolClass * klass) gobject_class->finalize = gst_vulkan_image_buffer_pool_finalize; - gstbufferpool_class->get_options = gst_vulkan_image_buffer_pool_get_options; gstbufferpool_class->set_config = gst_vulkan_image_buffer_pool_set_config; gstbufferpool_class->alloc_buffer = gst_vulkan_image_buffer_pool_alloc; } diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideofilter.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideofilter.c index 0828125103..079e9a2b5a 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideofilter.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideofilter.c @@ -278,7 +278,6 @@ gst_vulkan_video_filter_decide_allocation (GstBaseTransform * bt, config = gst_buffer_pool_get_config (pool); gst_buffer_pool_config_set_params (config, caps, size, min, max); - gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META); gst_buffer_pool_set_config (pool, config);