Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2573970ybt; Fri, 3 Jul 2020 12:35:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFipsc2jqYpLP1l3rbkX/s7zdy+BHvD7UI1Da/iUeDwvRBhq/oIN4BKkMIoJFjwSM1WJKP X-Received: by 2002:a17:906:c10f:: with SMTP id do15mr35253193ejc.249.1593804947367; Fri, 03 Jul 2020 12:35:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593804947; cv=none; d=google.com; s=arc-20160816; b=yg446ifAom1BM+oKP/gmYEUR7GUOmEJGrndVAASJSRAvVngYOFoG8VuBUYlgS0W7uX 7ZzS+hZ9wIi8j8KwGrl4L9XySY+QrUbBk23n10pBhgm6k57P+kwGnUmBL3vRet4byzaS LChRRawt2zoTj+kX/GmO4xBPWNz5uG0tDOdxGXl+h+/ztRyDty7BxH7L4GIqaX5ALSS5 sPehiUgAnJJwDZZBPLUt8hE18s+uXByCkH+GTcQXSAgRYw1XAiyrYD4IS/3qSdhfmXPU 1+ysy0quIrCQP/tvCOVfwXEfQr4DucyFWAIj4/NndRF2E3SndbmS2/P2rCTy6IhR8h/k b48w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:organization:references:in-reply-to:date:cc:to:from :subject:message-id; bh=DgnUQXA28N8Xj2Iq0hr8ig6R6Q4oWOx4HN0kh69OrIA=; b=PVKT46J6W0c+gUoi2ROyIL0MFedmITFlV0kZPIIU0byMvlaO3i4mExgB+T1hecFSAj aImBz0b/Q27KKp96IKmeU43RE//uuU5m3u5IM17IAAH1QGC9I0s2+ml//TmU4YR03fto SAXRw4VqLoUNmN+Vs7fysO9Mjg3qUCkFJb/RjgMXBbtWrvJQQ57Ag88SDv4zTSF1KxWv smoOwYhXiOkUzOtOktsR+hWgKGabCLzygCSRDixIEa+rIjUpVJzZvRaPdM/9+2URZIKh nHV84oLDW4bigxHVbGSwONDZ8PXomG76KYMt7LdXcQ9zaPevFJO/Ol64NlVfXGwA/xuJ QAog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b17si8599647ejb.626.2020.07.03.12.35.24; Fri, 03 Jul 2020 12:35:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726560AbgGCTdX (ORCPT + 99 others); Fri, 3 Jul 2020 15:33:23 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:47252 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbgGCTdX (ORCPT ); Fri, 3 Jul 2020 15:33:23 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id 649D62A663B Message-ID: Subject: Re: [PATCH 8/9] media: rkvdec: Add validate_fmt ops for pixelformat validation From: Ezequiel Garcia To: Jonas Karlman , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Hans Verkuil , Nicolas Dufresne , Tomasz Figa , Alexandre Courbot Date: Fri, 03 Jul 2020 16:33:12 -0300 In-Reply-To: <0353b993-907d-2dfe-993f-94b82aa27e00@kwiboo.se> References: <20200701215616.30874-1-jonas@kwiboo.se> <20200701215616.30874-9-jonas@kwiboo.se> <67a130a8fd8874c5dc639c924de959f88357b480.camel@collabora.com> <7abec9992460dcd84a2c951fce55bc8e46f2a0ed.camel@collabora.com> <0353b993-907d-2dfe-993f-94b82aa27e00@kwiboo.se> Organization: Collabora Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.0-1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2020-07-03 at 19:17 +0000, Jonas Karlman wrote: > On 2020-07-03 16:58, Ezequiel Garcia wrote: > > On Fri, 2020-07-03 at 06:55 +0000, Jonas Karlman wrote: > > > On 2020-07-03 05:14, Ezequiel Garcia wrote: > > > > Hi Jonas, > > > > > > > > Thanks for working on this. > > > > > > > > On Wed, 2020-07-01 at 21:56 +0000, Jonas Karlman wrote: > > > > > Add an optional validate_fmt operation that is used to validate the > > > > > pixelformat of CAPTURE buffers. > > > > > > > > > > This is used in next patch to ensure correct pixelformat is used for 10-bit > > > > > and 4:2:2 content. > > > > > > > > > > Signed-off-by: Jonas Karlman > > > > > --- > > > > > drivers/staging/media/rkvdec/rkvdec.c | 8 ++++++++ > > > > > drivers/staging/media/rkvdec/rkvdec.h | 1 + > > > > > 2 files changed, 9 insertions(+) > > > > > > > > > > diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c > > > > > index b1de55aa6535..465444c58f13 100644 > > > > > --- a/drivers/staging/media/rkvdec/rkvdec.c > > > > > +++ b/drivers/staging/media/rkvdec/rkvdec.c > > > > > @@ -239,6 +239,14 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, > > > > > if (WARN_ON(!coded_desc)) > > > > > return -EINVAL; > > > > > > > > > > + if (coded_desc->ops->validate_fmt) { > > > > > + int ret; > > > > > + > > > > > + ret = coded_desc->ops->validate_fmt(ctx, pix_mp->pixelformat); > > > > > + if (ret) > > > > > + return ret; > > > > > + } > > > > > + > > > > > > > > I don't think this approach will be enough. Unless I'm mistaken, > > > > it's perfectly legal as per the stateless spec to first > > > > call S_FMT on the OUTPUT queue (which is propagated to the CAPTURE side), > > > > and then set the SPS and other controls. > > > > > > I agree that this will not be enough to cover all use cases stated in the spec. > > > > > > > The application is not required to do a TRY_FMT after S_EXT_CTRLS. > > > > > > If I remember correctly we were required to implement a TRY_FMT loop in > > > ffmpeg due to cedrus defaulting to SUNXI_TILED_NV12 instead of linear NV12 > > > on platforms where display controller did not support the tiled modifier. > > > > > > So having TRY_FMT as part of the init sequence has been my only test-case. > > > > > > > What I believe is needed is for the S_EXT_CTRLS to modify > > > > and restrict the CAPTURE format accordingly, so the application > > > > gets the correct format on G_FMT (and restrict future TRY_FMT). > > > > > > This sounds like a proper solution, I do belive we may have a chicken or > > > the egg problem depending on if application call S_EXT_CTRLS or S_FMT first. > > > > > > > IIUC, the order is specified in the stateless spec [1]. > > > > 1) S_FMT on OUTPUT (to set the coded pixelformat). CAPTURE format > > format is propagated here and a default format is set. > > > > 2) S_EXT_CTRLS, parameters are set. We don't do anything here, > > but here we'd validate the SPS and restrict the CAPTURE pixelformat > > (and perhaps reset the default CAPTURE pixelformat). > > > > 3) G_FMT on CAPTURE. > > > > 4) (optional) ENUM_FMT / S_FMT on CAPTURE, to negotiate > > something different from default. > > There is also the following scenario that we may need to support: > > 1) S_FMT on OUTPUT, default CAPTURE format is set. > > 2) skip S_EXT_CTRLS, mandatory controls is only validated in req_validate. > > 3) G_FMT on CAPTURE, returns default CAPTURE format. > > 4) S_FMT on CAPTURE, CAPTURE format is changed from default to selected format. > > 5) STREAMON > > From this point on I would expect S_EXT_CTRLS with a V4L2_CTRL_WHICH_REQUEST_VAL > flag to reject any SPS not matching the selected CAPTURE format. Effectively > allowing S_FMT to lock down a format instead of an initial S_EXT_CTRLS during init. > > This means that we have to both allow and reject a SPS depending on the state. > Isn't it cleaner from an API to require the SPS at (2), right before G_FMT on CAPTURE? Unless you think it has clear advantages to provide more flexibility to the user, i.e. it will allow to support specific use-cases, then I would avoid making this flexible. The spec currently doesn mention step 2 as being optional, although there is a note mentioning controls can be overwritten. Thanks, Ezequiel > Regards, > Jonas > > > Regards, > > Ezequiel > > > > [1] Documentation/userspace-api/media/v4l/dev-stateless-decoder.rst > > > > > I guess we may need to lock down on a format at whatever comes first, > > > S_FMT on CAPTURE or S_EXT_CTRLS with SPS ctrl. > > > > > > I have an idea on how this could be addressed, will explore and see > > > if I can come up with something new. > > > > > > Regards, > > > Jonas > > > > > > > Also, V4L2 spec asks drivers not to fail on S_FMT > > > > format mismatch, but instead to adjust and return a legal format > > > > back to the application [1]. > > > > > > > > Let me know what you think and thanks again. > > > > > > > > Ezequiel > > > > > > > > [1] Documentation/userspace-api/media/v4l/vidioc-g-fmt.rst > > > > > > > > > for (i = 0; i < coded_desc->num_decoded_fmts; i++) { > > > > > if (coded_desc->decoded_fmts[i] == pix_mp->pixelformat) > > > > > break; > > > > > diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h > > > > > index 2fc9f46b6910..be4fc3645cde 100644 > > > > > --- a/drivers/staging/media/rkvdec/rkvdec.h > > > > > +++ b/drivers/staging/media/rkvdec/rkvdec.h > > > > > @@ -64,6 +64,7 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) > > > > > struct rkvdec_coded_fmt_ops { > > > > > int (*adjust_fmt)(struct rkvdec_ctx *ctx, > > > > > struct v4l2_format *f); > > > > > + int (*validate_fmt)(struct rkvdec_ctx *ctx, u32 pixelformat); > > > > > int (*start)(struct rkvdec_ctx *ctx); > > > > > void (*stop)(struct rkvdec_ctx *ctx); > > > > > int (*run)(struct rkvdec_ctx *ctx);