FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

v4l2: handle dequeueing correcly

Browse Source 
First clean up the buffers in the queue, then the remaining ones in the
device.
This commit is contained in:
Wim Taymans 2011-07-15 13:52:38 +01:00
parent c807bfb693
commit 37ef3f8997
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/v4l2/gstv4l2bufferpool.c
View File

@ -299,18 +299,21 @@ buffer_new_failed:
static gboolean static gboolean
gst_v4l2_buffer_pool_stop (GstBufferPool * bpool) gst_v4l2_buffer_pool_stop (GstBufferPool * bpool)
{ {
gboolean ret;
GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (bpool); GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (bpool);
guint n; guint n;
GST_DEBUG_OBJECT (pool, "stopping pool"); GST_DEBUG_OBJECT (pool, "stopping pool");
/* free the buffers: */ /* first free the buffers in the queue */
ret = GST_BUFFER_POOL_CLASS (parent_class)->stop (bpool);
/* then free the remaining buffers */
for (n = 0; n < pool->num_buffers; n++) { for (n = 0; n < pool->num_buffers; n++) {
if (pool->buffers[n]) if (pool->buffers[n])
gst_v4l2_buffer_pool_free_buffer (bpool, pool->buffers[n]); gst_v4l2_buffer_pool_free_buffer (bpool, pool->buffers[n]);
} }
/* also free the buffers in the queue */ return ret;
return GST_BUFFER_POOL_CLASS (parent_class)->stop (bpool);
} }
static GstFlowReturn static GstFlowReturn
@ -436,11 +439,10 @@ gst_v4l2_buffer_pool_acquire_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
else { else {
if (pool->num_queued == pool->num_buffers) { if (pool->num_queued == pool->num_buffers) {
ret = gst_v4l2_buffer_pool_dqbuf (bpool, buffer); ret = gst_v4l2_buffer_pool_dqbuf (bpool, buffer);
} else {
ret =
GST_BUFFER_POOL_CLASS (parent_class)->acquire_buffer (bpool, buffer,
params);
} }
ret =
GST_BUFFER_POOL_CLASS (parent_class)->acquire_buffer (bpool, buffer,
params);
} }
return ret; return ret;