mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
va: allocator: free allocator when a mem is held
An application, using for example appsink, can hold buffers from any va allocator after setting the pipeline to NULL. We need to destroy the allocator when that memory is unrefed. This patch juggles a bit with the allocator reference count in memories in order to achieve this: 1. When memory is created no alloc ref is modified 2. When memory is released, alloc ref is decreased 3. When memory is reassiged to a buffer, alloc ref is increased 4. When memory is flushed, alloc ref is increased becase it is going to be decreased in gst_memory_unref() Also this patch moves the deallocation of member variables to finalize() rather than dispose() Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1815>
This commit is contained in:
parent
ba4442a29d
commit
72ab56c376
1 changed files with 18 additions and 10 deletions
|
@ -381,6 +381,10 @@ _available_mems_flush (GstVaDisplay * display, GstAtomicQueue * available_mems,
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_MINI_OBJECT_CAST (mem)->dispose = NULL;
|
GST_MINI_OBJECT_CAST (mem)->dispose = NULL;
|
||||||
|
/* when mem are pushed available queue its allocator is unref,
|
||||||
|
* then now it is required to ref the allocator here because
|
||||||
|
* memory's finalize will unref it again */
|
||||||
|
gst_object_ref (mem->allocator);
|
||||||
gst_memory_unref (mem);
|
gst_memory_unref (mem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -438,6 +442,8 @@ gst_va_dmabuf_allocator_finalize (GObject * object)
|
||||||
{
|
{
|
||||||
GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (object);
|
GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (object);
|
||||||
|
|
||||||
|
gst_atomic_queue_unref (self->available_mems);
|
||||||
|
gst_clear_object (&self->display);
|
||||||
g_cond_clear (&self->buffer_cond);
|
g_cond_clear (&self->buffer_cond);
|
||||||
|
|
||||||
G_OBJECT_CLASS (dmabuf_parent_class)->finalize (object);
|
G_OBJECT_CLASS (dmabuf_parent_class)->finalize (object);
|
||||||
|
@ -453,10 +459,6 @@ gst_va_dmabuf_allocator_dispose (GObject * object)
|
||||||
if (self->surface_count != 0)
|
if (self->surface_count != 0)
|
||||||
GST_WARNING_OBJECT (self, "Surfaces leaked: %d", self->surface_count);
|
GST_WARNING_OBJECT (self, "Surfaces leaked: %d", self->surface_count);
|
||||||
|
|
||||||
gst_atomic_queue_unref (self->available_mems);
|
|
||||||
|
|
||||||
gst_clear_object (&self->display);
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (dmabuf_parent_class)->dispose (object);
|
G_OBJECT_CLASS (dmabuf_parent_class)->dispose (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -513,6 +515,8 @@ gst_va_dmabuf_memory_release (GstMiniObject * mini_object)
|
||||||
|
|
||||||
GST_OBJECT_UNLOCK (self);
|
GST_OBJECT_UNLOCK (self);
|
||||||
|
|
||||||
|
/* Keep last in case we are holding on the last allocator ref */
|
||||||
|
gst_object_unref (mem->allocator);
|
||||||
|
|
||||||
/* don't call mini_object's free */
|
/* don't call mini_object's free */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -676,8 +680,10 @@ gst_va_dmabuf_allocator_prepare_buffer (GstAllocator * allocator,
|
||||||
GST_OBJECT_UNLOCK (self);
|
GST_OBJECT_UNLOCK (self);
|
||||||
|
|
||||||
/* append them in reverse order */
|
/* append them in reverse order */
|
||||||
for (j = idx - 1; j >= 0; j--)
|
for (j = idx - 1; j >= 0; j--) {
|
||||||
|
gst_object_ref (mem[j]->allocator);
|
||||||
gst_buffer_append_memory (buffer, mem[j]);
|
gst_buffer_append_memory (buffer, mem[j]);
|
||||||
|
}
|
||||||
|
|
||||||
GST_TRACE_OBJECT (self, "Prepared surface %#x in buffer %p", surface, buffer);
|
GST_TRACE_OBJECT (self, "Prepared surface %#x in buffer %p", surface, buffer);
|
||||||
|
|
||||||
|
@ -886,6 +892,9 @@ gst_va_allocator_finalize (GObject * object)
|
||||||
{
|
{
|
||||||
GstVaAllocator *self = GST_VA_ALLOCATOR (object);
|
GstVaAllocator *self = GST_VA_ALLOCATOR (object);
|
||||||
|
|
||||||
|
gst_atomic_queue_unref (self->available_mems);
|
||||||
|
gst_clear_object (&self->display);
|
||||||
|
g_clear_pointer (&self->surface_formats, g_array_unref);
|
||||||
g_cond_clear (&self->buffer_cond);
|
g_cond_clear (&self->buffer_cond);
|
||||||
|
|
||||||
G_OBJECT_CLASS (gst_va_allocator_parent_class)->finalize (object);
|
G_OBJECT_CLASS (gst_va_allocator_parent_class)->finalize (object);
|
||||||
|
@ -901,11 +910,6 @@ gst_va_allocator_dispose (GObject * object)
|
||||||
if (self->surface_count != 0)
|
if (self->surface_count != 0)
|
||||||
GST_WARNING_OBJECT (self, "Surfaces leaked: %d", self->surface_count);
|
GST_WARNING_OBJECT (self, "Surfaces leaked: %d", self->surface_count);
|
||||||
|
|
||||||
gst_atomic_queue_unref (self->available_mems);
|
|
||||||
|
|
||||||
gst_clear_object (&self->display);
|
|
||||||
g_clear_pointer (&self->surface_formats, g_array_unref);
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (gst_va_allocator_parent_class)->dispose (object);
|
G_OBJECT_CLASS (gst_va_allocator_parent_class)->dispose (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1224,6 +1228,9 @@ gst_va_memory_release (GstMiniObject * mini_object)
|
||||||
|
|
||||||
GST_OBJECT_UNLOCK (self);
|
GST_OBJECT_UNLOCK (self);
|
||||||
|
|
||||||
|
/* Keep last in case we are holding on the last allocator ref */
|
||||||
|
gst_object_unref (mem->allocator);
|
||||||
|
|
||||||
/* don't call mini_object's free */
|
/* don't call mini_object's free */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1293,6 +1300,7 @@ gst_va_allocator_prepare_buffer (GstAllocator * allocator, GstBuffer * buffer)
|
||||||
mem = gst_atomic_queue_pop (self->available_mems);
|
mem = gst_atomic_queue_pop (self->available_mems);
|
||||||
GST_OBJECT_UNLOCK (self);
|
GST_OBJECT_UNLOCK (self);
|
||||||
|
|
||||||
|
gst_object_ref (mem->allocator);
|
||||||
surface = gst_va_memory_get_surface (mem);
|
surface = gst_va_memory_get_surface (mem);
|
||||||
gst_buffer_append_memory (buffer, mem);
|
gst_buffer_append_memory (buffer, mem);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue