mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 10:12:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: allocator: refactor GstVaBuffersurface

Browse source 
Move code up and add namespace to methods, and renaming
_creating_buffer_surface() to the canonical
gst_va_buffer_surface_new()

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1626>
This commit is contained in:
Víctor Manuel Jáquez Leal 2020-10-03 16:30:14 +02:00 committed by GStreamer Merge Bot
parent 734e2a74c4
commit 9c56c1b3e8
1 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
sys/va/gstvaallocator.c
View file

@ -53,15 +53,6 @@ static void _init_debug_category (void);
G_DEFINE_TYPE_WITH_CODE (GstVaDmabufAllocator, gst_va_dmabuf_allocator, G_DEFINE_TYPE_WITH_CODE (GstVaDmabufAllocator, gst_va_dmabuf_allocator,
GST_TYPE_DMABUF_ALLOCATOR, _init_debug_category ()); GST_TYPE_DMABUF_ALLOCATOR, _init_debug_category ());
typedef struct _GstVaBufferSurface GstVaBufferSurface;
struct _GstVaBufferSurface
{
GstVaDisplay *display;
GstVideoInfo info;
VASurfaceID surface;
volatile gint ref_count;
};
static void static void
_init_debug_category (void) _init_debug_category (void)
{ {
@ -320,6 +311,8 @@ _put_image (GstVaDisplay * display, VASurfaceID surface, VAImage * image)
return TRUE; return TRUE;
} }
/*=========================== Quarks for GstMemory ===========================*/
static GQuark static GQuark
gst_va_buffer_surface_quark (void) gst_va_buffer_surface_quark (void)
{ {
@ -346,6 +339,48 @@ gst_va_drm_mod_quark (void)
return drm_mod_quark; return drm_mod_quark;
} }
/*========================= GstVaBufferSurface ===============================*/
typedef struct _GstVaBufferSurface GstVaBufferSurface;
struct _GstVaBufferSurface
{
GstVaDisplay *display;
GstVideoInfo info;
VASurfaceID surface;
volatile gint ref_count;
};
static void
gst_va_buffer_surface_unref (gpointer data)
{
GstVaBufferSurface *buf = data;
g_return_if_fail (buf && GST_IS_VA_DISPLAY (buf->display));
if (g_atomic_int_dec_and_test (&buf->ref_count)) {
GST_LOG_OBJECT (buf->display, "Destroying surface %#x", buf->surface);
_destroy_surfaces (buf->display, &buf->surface, 1);
gst_clear_object (&buf->display);
g_slice_free (GstVaBufferSurface, buf);
}
}
static GstVaBufferSurface *
gst_va_buffer_surface_new (VASurfaceID surface, GstVideoFormat format,
gint width, gint height)
{
GstVaBufferSurface *buf = g_slice_new (GstVaBufferSurface);
g_atomic_int_set (&buf->ref_count, 0);
buf->surface = surface;
buf->display = NULL;
gst_video_info_set_format (&buf->info, format, width, height);
return buf;
}
/*=========================== GstVaDmabufAllocator ===========================*/
static gpointer static gpointer
gst_va_dmabuf_mem_map (GstMemory * gmem, gsize maxsize, GstMapFlags flags) gst_va_dmabuf_mem_map (GstMemory * gmem, gsize maxsize, GstMapFlags flags)
{ {
@ -425,35 +460,6 @@ gst_va_dmabuf_allocator_new (GstVaDisplay * display)
return GST_ALLOCATOR (self); return GST_ALLOCATOR (self);
} }
static void
_buffer_surface_unref (gpointer data)
{
GstVaBufferSurface *buf = data;
g_return_if_fail (buf && GST_IS_VA_DISPLAY (buf->display));
if (g_atomic_int_dec_and_test (&buf->ref_count)) {
GST_LOG_OBJECT (buf->display, "Destroying surface %#x", buf->surface);
_destroy_surfaces (buf->display, &buf->surface, 1);
gst_clear_object (&buf->display);
g_slice_free (GstVaBufferSurface, buf);
}
}
static GstVaBufferSurface *
_create_buffer_surface (VASurfaceID surface, GstVideoFormat format,
gint width, gint height)
{
GstVaBufferSurface *buf = g_slice_new (GstVaBufferSurface);
g_atomic_int_set (&buf->ref_count, 0);
buf->surface = surface;
buf->display = NULL;
gst_video_info_set_format (&buf->info, format, width, height);
return buf;
}
static inline goffset static inline goffset
_get_fd_size (gint fd) _get_fd_size (gint fd)
{ {
@ -534,7 +540,7 @@ gst_va_dmabuf_allocator_setup_buffer (GstAllocator * allocator,
goto failed; goto failed;
} }
buf = _create_buffer_surface (surface, format, desc.width, desc.height); buf = gst_va_buffer_surface_new (surface, format, desc.width, desc.height);
GST_VIDEO_INFO_SIZE (&buf->info) = 0; GST_VIDEO_INFO_SIZE (&buf->info) = 0;
for (i = 0; i < desc.num_objects; i++) { for (i = 0; i < desc.num_objects; i++) {
@ -715,7 +721,7 @@ gst_va_dmabuf_memories_setup (GstVaDisplay * display, GstVideoInfo * info,
GST_LOG_OBJECT (display, "Created surface %#x [%dx%d]", surface, GST_LOG_OBJECT (display, "Created surface %#x [%dx%d]", surface,
ext_buf.width, ext_buf.height); ext_buf.width, ext_buf.height);
buf = _create_buffer_surface (surface, rt_format, ext_buf.width, buf = gst_va_buffer_surface_new (surface, rt_format, ext_buf.width,
ext_buf.height); ext_buf.height);
buf->info = *info; buf->info = *info;
buf->display = gst_object_ref (display); buf->display = gst_object_ref (display);
@ -723,7 +729,7 @@ gst_va_dmabuf_memories_setup (GstVaDisplay * display, GstVideoInfo * info,
for (i = 0; i < n_planes; i++) { for (i = 0; i < n_planes; i++) {
g_atomic_int_add (&buf->ref_count, 1); g_atomic_int_add (&buf->ref_count, 1);
gst_mini_object_set_qdata (GST_MINI_OBJECT (mem[i]), gst_mini_object_set_qdata (GST_MINI_OBJECT (mem[i]),
gst_va_buffer_surface_quark (), buf, _buffer_surface_unref); gst_va_buffer_surface_quark (), buf, gst_va_buffer_surface_unref);
GST_INFO_OBJECT (display, "setting surface %#x to dmabuf fd %d", GST_INFO_OBJECT (display, "setting surface %#x to dmabuf fd %d",
buf->surface, gst_dmabuf_memory_get_fd (mem[i])); buf->surface, gst_dmabuf_memory_get_fd (mem[i]));
} }