2022-04-22 15:00:47 +00:00
|
|
|
From 6dd673a9ad45c668727086d342c5c8799bb426c8 Mon Sep 17 00:00:00 2001
|
2021-11-24 17:32:01 +00:00
|
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
|
|
|
Date: Mon, 1 Feb 2021 18:48:47 +0000
|
2022-04-22 15:00:47 +00:00
|
|
|
Subject: [PATCH 358/828] media/v4l2_m2m: In buffered mode run jobs if either
|
2021-11-24 17:32:01 +00:00
|
|
|
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(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
|
|
|
|
|
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
|
2022-04-22 15:00:47 +00:00
|
|
|
@@ -301,9 +301,10 @@ static void __v4l2_m2m_try_queue(struct
|
2021-11-24 17:32:01 +00:00
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
