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

v4l2bufferpool: implement dispose method

Browse source 
Unref objects in dispose method rather than in finalize in order to
prevent circular reference.

https://bugzilla.gnome.org/show_bug.cgi?id=738102
This commit is contained in:
Aurélien Zanelli 2014-10-08 10:31:21 +02:00 committed by Nicolas Dufresne
parent 7ed27c264c
commit 8e9c752eca
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
sys/v4l2/gstv4l2bufferpool.c
View file

@ -1319,7 +1319,7 @@ gst_v4l2_buffer_pool_release_buffer (GstBufferPool * bpool, GstBuffer * buffer)
} }
static void static void
gst_v4l2_buffer_pool_finalize (GObject * object) gst_v4l2_buffer_pool_dispose (GObject * object)
{ {
GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (object); GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (object);
gint i; gint i;
@ -1329,21 +1329,35 @@ gst_v4l2_buffer_pool_finalize (GObject * object)
gst_buffer_replace (&(pool->buffers[i]), NULL); gst_buffer_replace (&(pool->buffers[i]), NULL);
} }
if (pool->vallocator)
gst_object_unref (pool->vallocator);
pool->vallocator = NULL;
if (pool->allocator)
gst_object_unref (pool->allocator);
pool->allocator = NULL;
if (pool->other_pool)
gst_object_unref (pool->other_pool);
pool->other_pool = NULL;
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gst_v4l2_buffer_pool_finalize (GObject * object)
{
GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (object);
if (pool->video_fd >= 0) if (pool->video_fd >= 0)
v4l2_close (pool->video_fd); v4l2_close (pool->video_fd);
gst_poll_free (pool->poll); gst_poll_free (pool->poll);
if (pool->vallocator) /* FIXME Is this required to keep around ?
gst_object_unref (pool->vallocator); * This can't be done in dispose method because we must not set pointer
* to NULL as it is part of the v4l2object and dispose could be called
if (pool->allocator) * multiple times */
gst_object_unref (pool->allocator);
if (pool->other_pool)
gst_object_unref (pool->other_pool);
/* FIXME Is this required to keep around ? */
gst_object_unref (pool->obj->element); gst_object_unref (pool->obj->element);
g_cond_clear (&pool->empty_cond); g_cond_clear (&pool->empty_cond);
@ -1368,6 +1382,7 @@ gst_v4l2_buffer_pool_class_init (GstV4l2BufferPoolClass * klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GstBufferPoolClass *bufferpool_class = GST_BUFFER_POOL_CLASS (klass); GstBufferPoolClass *bufferpool_class = GST_BUFFER_POOL_CLASS (klass);
object_class->dispose = gst_v4l2_buffer_pool_dispose;
object_class->finalize = gst_v4l2_buffer_pool_finalize; object_class->finalize = gst_v4l2_buffer_pool_finalize;
bufferpool_class->start = gst_v4l2_buffer_pool_start; bufferpool_class->start = gst_v4l2_buffer_pool_start;