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

bufferpool: call release_buffer after alloc

Browse source 
After we allocated a new buffer, call the release_buffer vmethod to put the new
buffer in the pool instead of assuming that the pool uses the default
release_method implementation.
This commit is contained in:
Wim Taymans 2011-07-15 13:27:13 +02:00
parent 2f429009a3
commit 1dddb1f704
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/gstbufferpool.c
View file

@ -194,9 +194,10 @@ default_start (GstBufferPool * pool)
goto alloc_failed; goto alloc_failed;
GST_LOG_OBJECT (pool, "prealloced buffer %d: %p", i, buffer); GST_LOG_OBJECT (pool, "prealloced buffer %d: %p", i, buffer);
/* store in the queue */ /* release to the queue, we call the vmethod directly, we don't need to do
gst_atomic_queue_push (pool->queue, buffer); * the other refcount handling right now. */
gst_poll_write_control (pool->poll); if (G_LIKELY (pclass->release_buffer))
pclass->release_buffer (pool, buffer);
} }
return TRUE; return TRUE;
@ -252,6 +253,7 @@ default_stop (GstBufferPool * pool)
/* clear the pool */ /* clear the pool */
while ((buffer = gst_atomic_queue_pop (pool->queue))) { while ((buffer = gst_atomic_queue_pop (pool->queue))) {
GST_LOG_OBJECT (pool, "freeing %p", buffer);
gst_poll_read_control (pool->poll); gst_poll_read_control (pool->poll);
if (G_LIKELY (pclass->free_buffer)) if (G_LIKELY (pclass->free_buffer))
@ -316,13 +318,17 @@ gst_buffer_pool_set_active (GstBufferPool * pool, gboolean active)
gst_poll_read_control (pool->poll); gst_poll_read_control (pool->poll);
g_atomic_int_set (&pool->flushing, FALSE); g_atomic_int_set (&pool->flushing, FALSE);
} else { } else {
gint outstanding;
/* set to flushing first */ /* set to flushing first */
g_atomic_int_set (&pool->flushing, TRUE); g_atomic_int_set (&pool->flushing, TRUE);
gst_poll_write_control (pool->poll); gst_poll_write_control (pool->poll);
/* when all buffers are in the pool, free them. Else they will be /* when all buffers are in the pool, free them. Else they will be
* freed when they are released */ * freed when they are released */
if (g_atomic_int_get (&pool->outstanding) == 0) { outstanding = g_atomic_int_get (&pool->outstanding);
GST_LOG_OBJECT (pool, "outstanding buffers %d", outstanding);
if (outstanding == 0) {
if (!do_stop (pool)) if (!do_stop (pool))
goto stop_failed; goto stop_failed;
} }