summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2016-11-24 14:25:22 +0100
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2016-11-24 11:47:07 -0500
commit6b5807654b3b9eca69f59261009c1e47d83ef483 (patch)
tree847445d35cad6f77195e4894abaeda71b0ab233e
parent65826f819ad96b997847f2b87c4bc52b16e02e34 (diff)
gstv4l2bufferpool: remove critical error message when process is called on an inactive pool
If the pool is inactive, it is guaranteed to also be flushing, so the following check will return GST_FLOW_FLUSHING anyway. This can happen if a v4l2src is blocking on DQBUF in create and is sent an EOS event on another thread. In that case the pool is set to flushing/inactive without locking, the v4l2src is unblocked, and may call pool_process with a valid buffer on the already inactive pool. https://bugzilla.gnome.org/show_bug.cgi?id=775014
-rw-r--r--sys/v4l2/gstv4l2bufferpool.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index bfcfbaa11..9c862d4ed 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -1703,8 +1703,6 @@ gst_v4l2_buffer_pool_process (GstV4l2BufferPool * pool, GstBuffer ** buf)
GST_DEBUG_OBJECT (pool, "process buffer %p", buf);
- g_return_val_if_fail (gst_buffer_pool_is_active (bpool), GST_FLOW_ERROR);
-
if (GST_BUFFER_POOL_IS_FLUSHING (pool))
return GST_FLOW_FLUSHING;