From 303b1ea3505c37f842f806adaac109303cedf3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 30 Sep 2020 15:45:54 +0200 Subject: [PATCH] va: allocator: rename gst_va_dmabuf_allocator_setup_buffer() Since it's related with GstVaDmabufAllocator. Part-of: --- sys/va/gstvaallocator.c | 6 +++--- sys/va/gstvaallocator.h | 6 +++--- sys/va/gstvapool.c | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/va/gstvaallocator.c b/sys/va/gstvaallocator.c index 8a1ea58772..ca67a134a6 100644 --- a/sys/va/gstvaallocator.c +++ b/sys/va/gstvaallocator.c @@ -479,8 +479,8 @@ gst_va_memory_dispose (GstMiniObject * mini_object) /* creates an exported VASurface and adds it as @buffer's memories * qdata */ gboolean -gst_va_dmabuf_setup_buffer (GstAllocator * allocator, GstBuffer * buffer, - GstVaAllocationParams * params) +gst_va_dmabuf_allocator_setup_buffer (GstAllocator * allocator, + GstBuffer * buffer, GstVaAllocationParams * params) { GstVaBufferSurface *buf; GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (allocator); @@ -584,7 +584,7 @@ gst_va_dmabuf_try (GstAllocator * allocator, GstVaAllocationParams * params) GstMapInfo map_info; gboolean ret; - ret = gst_va_dmabuf_setup_buffer (allocator, buffer, params); + ret = gst_va_dmabuf_allocator_setup_buffer (allocator, buffer, params); if (ret) { /* XXX: radeonsi for kadaveri cannot map dmabufs to user space */ if (!gst_buffer_map (buffer, &map_info, GST_MAP_READWRITE)) { diff --git a/sys/va/gstvaallocator.h b/sys/va/gstvaallocator.h index 5e5bb6a834..1822afc526 100644 --- a/sys/va/gstvaallocator.h +++ b/sys/va/gstvaallocator.h @@ -39,9 +39,9 @@ G_DECLARE_FINAL_TYPE (GstVaDmabufAllocator, gst_va_dmabuf_allocator, GST, VA_DMABUF_ALLOCATOR, GstDmaBufAllocator); GstAllocator * gst_va_dmabuf_allocator_new (GstVaDisplay * display); -gboolean gst_va_dmabuf_setup_buffer (GstAllocator * allocator, - GstBuffer * buffer, - GstVaAllocationParams * params); +gboolean gst_va_dmabuf_allocator_setup_buffer (GstAllocator * allocator, + GstBuffer * buffer, + GstVaAllocationParams * params); gboolean gst_va_dmabuf_try (GstAllocator * allocator, GstVaAllocationParams * params); diff --git a/sys/va/gstvapool.c b/sys/va/gstvapool.c index 16505b3599..dab8d243cf 100644 --- a/sys/va/gstvapool.c +++ b/sys/va/gstvapool.c @@ -193,7 +193,8 @@ gst_va_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer, buf = gst_buffer_new (); if (GST_IS_VA_DMABUF_ALLOCATOR (vpool->allocator)) { - if (!gst_va_dmabuf_setup_buffer (vpool->allocator, buf, &alloc_params)) + if (!gst_va_dmabuf_allocator_setup_buffer (vpool->allocator, buf, + &alloc_params)) goto no_memory; } else if (GST_IS_VA_ALLOCATOR (vpool->allocator)) { GstMemory *mem = gst_va_allocator_alloc (vpool->allocator, &alloc_params);