mirror of
https://github.com/lingble/meta-tegra.git
synced 2025-10-29 11:32:30 +00:00
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From e44664958ad6154c95d559011bc33c38751f9932 Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
|
|
Date: Fri, 26 Jun 2020 11:05:25 -0400
|
|
Subject: [PATCH 3/7] v4l2bufferpool: Avoid set_flushing warning
|
|
|
|
The gst_buffer_pool_set_flushing() warns when that function is called
|
|
on an inactive pool. Avoid the warning by checking the state, this is
|
|
similar to what we do in gst_v4l2_object_unlock().
|
|
|
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/649>
|
|
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
|
---
|
|
gstv4l2bufferpool.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gstv4l2bufferpool.c b/gstv4l2bufferpool.c
|
|
index 1023d4c..15345d1 100644
|
|
--- a/gstv4l2bufferpool.c
|
|
+++ b/gstv4l2bufferpool.c
|
|
@@ -1269,7 +1269,7 @@ gst_v4l2_buffer_pool_flush_start (GstBufferPool * bpool)
|
|
g_cond_broadcast (&pool->empty_cond);
|
|
GST_OBJECT_UNLOCK (pool);
|
|
|
|
- if (pool->other_pool)
|
|
+ if (pool->other_pool && gst_buffer_pool_is_active (pool->other_pool))
|
|
gst_buffer_pool_set_flushing (pool->other_pool, TRUE);
|
|
}
|
|
|
|
@@ -1280,7 +1280,7 @@ gst_v4l2_buffer_pool_flush_stop (GstBufferPool * bpool)
|
|
|
|
GST_DEBUG_OBJECT (pool, "stop flushing");
|
|
|
|
- if (pool->other_pool)
|
|
+ if (pool->other_pool && gst_buffer_pool_is_active (pool->other_pool))
|
|
gst_buffer_pool_set_flushing (pool->other_pool, FALSE);
|
|
|
|
#ifndef USE_V4L2_TARGET_NV
|
|
--
|
|
2.34.1
|
|
|