Rémi Bernon : winegstreamer: Use a new wg_video_buffer_pool class to add buffer meta.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 644cc11653dbdf8c1e9f703462339e731ac6da38
URL:    https://gitlab.winehq.org/wine/wine/-/commit/644cc11653dbdf8c1e9f703462339e7...

Author: Rémi Bernon 
Date:   Tue Jul  2 09:21:55 2024 +0200

winegstreamer: Use a new wg_video_buffer_pool class to add buffer meta.

---

dlls/winegstreamer/wg_transform.c | 84 +++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 26 deletions(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 018131f4f97..a6f12d41080 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -82,6 +82,57 @@ static void align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVi
     gst_video_info_align(info, align);
 }

+typedef struct
+{
+    GstVideoBufferPool parent;
+    GstVideoInfo info;
+} WgVideoBufferPool;
+
+typedef struct
+{
+    GstVideoBufferPoolClass parent_class;
+} WgVideoBufferPoolClass;
+
+G_DEFINE_TYPE(WgVideoBufferPool, wg_video_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL);
+
+static void wg_video_buffer_pool_init(WgVideoBufferPool *pool)
+{
+}
+
+static void wg_video_buffer_pool_class_init(WgVideoBufferPoolClass *klass)
+{
+}
+
+static WgVideoBufferPool *wg_video_buffer_pool_create(GstCaps *caps, gsize plane_align,
+        GstAllocator *allocator, GstVideoAlignment *align)
+{
+    WgVideoBufferPool *pool;
+    GstStructure *config;
+
+    if (!(pool = g_object_new(wg_video_buffer_pool_get_type(), NULL)))
+        return NULL;
+
+    gst_video_info_from_caps(&pool->info, caps);
+    align_video_info_planes(plane_align, &pool->info, align);
+
+    if (!(config = gst_buffer_pool_get_config(GST_BUFFER_POOL(pool))))
+        GST_ERROR("Failed to get %"GST_PTR_FORMAT" config.", pool);
+    else
+    {
+        gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+        gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+        gst_buffer_pool_config_set_video_alignment(config, align);
+
+        gst_buffer_pool_config_set_params(config, caps, pool->info.size, 0, 0);
+        gst_buffer_pool_config_set_allocator(config, allocator, NULL);
+        if (!gst_buffer_pool_set_config(GST_BUFFER_POOL(pool), config))
+            GST_ERROR("Failed to set %"GST_PTR_FORMAT" config.", pool);
+    }
+
+    GST_INFO("Created %"GST_PTR_FORMAT, pool);
+    return pool;
+}
+
 static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer)
 {
     struct wg_transform *transform = gst_pad_get_element_private(pad);
@@ -128,13 +179,11 @@ static gboolean transform_src_query_cb(GstPad *pad, GstObject *parent, GstQuery

static gboolean transform_sink_query_allocation(struct wg_transform *transform, GstQuery *query)
 {
-    gsize plane_align = transform->attrs.output_plane_align;
-    GstStructure *config, *params;
+    WgVideoBufferPool *pool;
     GstVideoAlignment align;
     const char *mime_type;
+    GstStructure *params;
     gboolean needs_pool;
-    GstBufferPool *pool;
-    GstVideoInfo info;
     GstCaps *caps;

GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query);
@@ -145,12 +194,10 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform,
     if (strcmp(mime_type, "video/x-raw") || !needs_pool)
         return false;

-    if (!gst_video_info_from_caps(&info, caps)
-            || !(pool = gst_video_buffer_pool_new()))
+    if (!(pool = wg_video_buffer_pool_create(caps, transform->attrs.output_plane_align,
+            transform->allocator, &align)))
         return false;

-    align_video_info_planes(plane_align, &info, &align);
-
     if ((params = gst_structure_new("video-meta",
             "padding-top", G_TYPE_UINT, align.padding_top,
             "padding-bottom", G_TYPE_UINT, align.padding_bottom,
@@ -162,30 +209,15 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform,
         gst_structure_free(params);
     }

-    if (!(config = gst_buffer_pool_get_config(pool)))
-        GST_ERROR("Failed to get %"GST_PTR_FORMAT" config.", pool);
-    else
-    {
-        gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META);
-        gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
-        gst_buffer_pool_config_set_video_alignment(config, &align);
-
-        gst_buffer_pool_config_set_params(config, caps,
-                info.size, 0, 0);
-        gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL);
-        if (!gst_buffer_pool_set_config(pool, config))
-            GST_ERROR("Failed to set %"GST_PTR_FORMAT" config.", pool);
-    }
-
     /* Prevent pool reconfiguration, we don't want another alignment. */
-    if (!gst_buffer_pool_set_active(pool, true))
+    if (!gst_buffer_pool_set_active(GST_BUFFER_POOL(pool), true))
         GST_ERROR("%"GST_PTR_FORMAT" failed to activate.", pool);

-    gst_query_add_allocation_pool(query, pool, info.size, 0, 0);
+    gst_query_add_allocation_pool(query, GST_BUFFER_POOL(pool), pool->info.size, 0, 0);
     gst_query_add_allocation_param(query, transform->allocator, NULL);

GST_INFO("Proposing %"GST_PTR_FORMAT", buffer size %#zx, %"GST_PTR_FORMAT", for %"GST_PTR_FORMAT,
-            pool, info.size, transform->allocator, query);
+            pool, pool->info.size, transform->allocator, query);

g_object_unref(pool);
     return true;