mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 21:51:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: pool: call parent's start() method

Browse source 
Without preallocating buffers and memories a deadlock in pool allocator is
highly probably since it might hit the case were buffer is returned to the pool
but their memories are still hold by a copy downstream, without other
preallocated buffers available.

This kind of a hack, where buffer_reset() follow the normal path if it's called
from start().

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1667>
This commit is contained in:
Víctor Manuel Jáquez Leal 2020-10-08 10:26:54 +02:00
parent 8f936baffe
commit 6a8fa67f42
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sys/va/gstvapool.c
View file

@ -40,6 +40,8 @@ struct _GstVaPool
gboolean add_videometa; gboolean add_videometa;
gboolean need_alignment; gboolean need_alignment;
GstVideoAlignment video_align; GstVideoAlignment video_align;
gboolean starting;
}; };
#define gst_va_pool_parent_class parent_class #define gst_va_pool_parent_class parent_class
@ -223,10 +225,16 @@ no_memory:
static void static void
gst_va_pool_reset_buffer (GstBufferPool * pool, GstBuffer * buffer) gst_va_pool_reset_buffer (GstBufferPool * pool, GstBuffer * buffer)
{ {
GstVaPool *vpool = GST_VA_POOL (pool);
/* Clears all the memories and only pool the GstBuffer objects */ /* Clears all the memories and only pool the GstBuffer objects */
gst_buffer_remove_all_memory (buffer); if (G_LIKELY (!vpool->starting))
gst_buffer_remove_all_memory (buffer);
GST_BUFFER_POOL_CLASS (parent_class)->reset_buffer (pool, buffer); GST_BUFFER_POOL_CLASS (parent_class)->reset_buffer (pool, buffer);
GST_BUFFER_FLAGS (buffer) = 0;
if (G_LIKELY (!vpool->starting))
GST_BUFFER_FLAGS (buffer) = 0;
} }
static GstFlowReturn static GstFlowReturn
@ -268,6 +276,19 @@ gst_va_pool_flush_start (GstBufferPool * pool)
gst_va_allocator_flush (vpool->allocator); gst_va_allocator_flush (vpool->allocator);
} }
static gboolean
gst_va_pool_start (GstBufferPool * pool)
{
GstVaPool *vpool = GST_VA_POOL (pool);
gboolean ret;
vpool->starting = TRUE;
ret = GST_BUFFER_POOL_CLASS (parent_class)->start (pool);
vpool->starting = FALSE;
return ret;
}
static void static void
gst_va_pool_dispose (GObject * object) gst_va_pool_dispose (GObject * object)
{ {
@ -294,7 +315,7 @@ gst_va_pool_class_init (GstVaPoolClass * klass)
gstbufferpool_class->reset_buffer = gst_va_pool_reset_buffer; gstbufferpool_class->reset_buffer = gst_va_pool_reset_buffer;
gstbufferpool_class->acquire_buffer = gst_va_pool_acquire_buffer; gstbufferpool_class->acquire_buffer = gst_va_pool_acquire_buffer;
gstbufferpool_class->flush_start = gst_va_pool_flush_start; gstbufferpool_class->flush_start = gst_va_pool_flush_start;
gstbufferpool_class->start = NULL; gstbufferpool_class->start = gst_va_pool_start;
} }
static void static void