git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From f9ab3e8acbbd27e81a232aa671838ace4263d46a Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Mon, 1 Feb 2021 18:48:47 +0000
   4 Subject: [PATCH] media/v4l2_m2m: In buffered mode run jobs if either
   5  port is streaming
   6
   7 In order to get the intended behaviour of the stateful video
   8 decoder API where only the OUTPUT queue needs to be enabled and fed
   9 buffers in order to get the SOURCE_CHANGED event that configures the
  10 CAPTURE queue, we want the device to run should either queue be
  11 streaming.
  12
  13 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  14 ---
  15  drivers/media/v4l2-core/v4l2-mem2mem.c | 7 ++++---
  16  1 file changed, 4 insertions(+), 3 deletions(-)
  17
  18 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
  19 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
  20 @@ -301,9 +301,10 @@ static void __v4l2_m2m_try_queue(struct
  21
  22         dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx);
  23
  24 -       if (!m2m_ctx->out_q_ctx.q.streaming
  25 -           || !m2m_ctx->cap_q_ctx.q.streaming) {
  26 -               dprintk("Streaming needs to be on for both queues\n");
  27 +       if (!(m2m_ctx->out_q_ctx.q.streaming &&
  28 +             m2m_ctx->cap_q_ctx.q.streaming) &&
  29 +           !(m2m_ctx->out_q_ctx.buffered && m2m_ctx->out_q_ctx.q.streaming)) {
  30 +               dprintk("Streaming needs to be on for both queues, or buffered and OUTPUT streaming\n");
  31                 return;
  32         }
  33