libs: va: drop use of GSlice

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
This commit is contained in:
Tim-Philipp Müller 2023-01-08 18:03:49 +00:00 committed by GStreamer Marge Bot
parent 32384c0c69
commit e214be79de
2 changed files with 8 additions and 8 deletions

View File

@ -125,7 +125,7 @@ gst_va_buffer_surface_unref (gpointer data)
GST_LOG_OBJECT (buf->display, "Destroying surface %#x", buf->surface); GST_LOG_OBJECT (buf->display, "Destroying surface %#x", buf->surface);
va_destroy_surfaces (buf->display, &buf->surface, 1); va_destroy_surfaces (buf->display, &buf->surface, 1);
gst_clear_object (&buf->display); gst_clear_object (&buf->display);
g_slice_free (GstVaBufferSurface, buf); g_free (buf);
} }
} }
@ -133,7 +133,7 @@ static GstVaBufferSurface *
gst_va_buffer_surface_new (VASurfaceID surface, GstVideoFormat format, gst_va_buffer_surface_new (VASurfaceID surface, GstVideoFormat format,
gint width, gint height) gint width, gint height)
{ {
GstVaBufferSurface *buf = g_slice_new (GstVaBufferSurface); GstVaBufferSurface *buf = g_new (GstVaBufferSurface, 1);
g_atomic_int_set (&buf->ref_count, 0); g_atomic_int_set (&buf->ref_count, 0);
g_atomic_int_set (&buf->ref_mems_count, 0); g_atomic_int_set (&buf->ref_mems_count, 0);
@ -194,7 +194,7 @@ gst_va_memory_pool_flush_unlocked (GstVaMemoryPool * self,
GST_LOG ("Destroying surface %#x", buf->surface); GST_LOG ("Destroying surface %#x", buf->surface);
va_destroy_surfaces (display, &buf->surface, 1); va_destroy_surfaces (display, &buf->surface, 1);
self->surface_count -= 1; /* GstVaDmabufAllocator */ self->surface_count -= 1; /* GstVaDmabufAllocator */
g_slice_free (GstVaBufferSurface, buf); g_free (buf);
} }
} else { } else {
self->surface_count -= 1; /* GstVaAllocator */ self->surface_count -= 1; /* GstVaAllocator */
@ -1170,7 +1170,7 @@ _va_free (GstAllocator * allocator, GstMemory * mem)
g_mutex_clear (&va_mem->lock); g_mutex_clear (&va_mem->lock);
g_slice_free (GstVaMemory, va_mem); g_free (va_mem);
} }
static void static void
@ -1444,7 +1444,7 @@ _va_share (GstMemory * mem, gssize offset, gssize size)
if (size == -1) if (size == -1)
size = mem->maxsize - offset; size = mem->maxsize - offset;
sub = g_slice_new (GstVaMemory); sub = g_new (GstVaMemory, 1);
/* the shared memory is alwyas readonly */ /* the shared memory is alwyas readonly */
gst_memory_init (GST_MEMORY_CAST (sub), GST_MINI_OBJECT_FLAGS (parent) | gst_memory_init (GST_MEMORY_CAST (sub), GST_MINI_OBJECT_FLAGS (parent) |
@ -1593,7 +1593,7 @@ gst_va_allocator_alloc (GstAllocator * allocator)
&surface, 1)) &surface, 1))
return NULL; return NULL;
mem = g_slice_new (GstVaMemory); mem = g_new (GstVaMemory, 1);
mem->surface = surface; mem->surface = surface;
mem->surface_format = self->surface_format; mem->surface_format = self->surface_format;

View File

@ -71,7 +71,7 @@ gst_va_surface_copy_new (GstVaDisplay * display, GstVideoInfo * vinfo)
g_return_val_if_fail (GST_IS_VA_DISPLAY (display), NULL); g_return_val_if_fail (GST_IS_VA_DISPLAY (display), NULL);
g_return_val_if_fail (vinfo != NULL, NULL); g_return_val_if_fail (vinfo != NULL, NULL);
self = g_slice_new (GstVaSurfaceCopy); self = g_new (GstVaSurfaceCopy, 1);
self->display = gst_object_ref (display); self->display = gst_object_ref (display);
self->has_copy = _has_copy (display); self->has_copy = _has_copy (display);
self->info = *vinfo; self->info = *vinfo;
@ -89,7 +89,7 @@ gst_va_surface_copy_free (GstVaSurfaceCopy * self)
g_rec_mutex_clear (&self->lock); g_rec_mutex_clear (&self->lock);
g_slice_free (GstVaSurfaceCopy, self); g_free (self);
} }
gboolean gboolean