mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From 4c5fe2ac9d504796d29ed72aa2efe2244dc0cc27 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 1 Feb 2021 18:48:47 +0000
|
|
Subject: [PATCH 0281/1002] media/v4l2_m2m: In buffered mode run jobs if either
|
|
port is streaming
|
|
|
|
In order to get the intended behaviour of the stateful video
|
|
decoder API where only the OUTPUT queue needs to be enabled and fed
|
|
buffers in order to get the SOURCE_CHANGED event that configures the
|
|
CAPTURE queue, we want the device to run should either queue be
|
|
streaming.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/media/v4l2-core/v4l2-mem2mem.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
|
|
index f1ecc99f796b..55444b9b3a5a 100644
|
|
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
|
|
@@ -301,9 +301,10 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev,
|
|
|
|
dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx);
|
|
|
|
- if (!m2m_ctx->out_q_ctx.q.streaming
|
|
- || !m2m_ctx->cap_q_ctx.q.streaming) {
|
|
- dprintk("Streaming needs to be on for both queues\n");
|
|
+ if (!(m2m_ctx->out_q_ctx.q.streaming &&
|
|
+ m2m_ctx->cap_q_ctx.q.streaming) &&
|
|
+ !(m2m_ctx->out_q_ctx.buffered && m2m_ctx->out_q_ctx.q.streaming)) {
|
|
+ dprintk("Streaming needs to be on for both queues, or buffered and OUTPUT streaming\n");
|
|
return;
|
|
}
|
|
|
|
--
|
|
2.44.0
|
|
|