From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
To: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Cc: p.zabel@pengutronix.de, mchehab@kernel.org, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de,
daniel.almeida@collabora.com, nicolas.dufresne@collabora.co.uk,
linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel@collabora.com
Subject: Re: [PATCH v2 13/13] media: verisilicon: Conditionnaly ignore native formats
Date: Sun, 8 Jan 2023 18:12:34 -0300 [thread overview]
Message-ID: <CAAEAJfBRtBSZt0B3OyQSCHhsseUn6_H+JSvAR3cOH15WUryuNw@mail.gmail.com> (raw)
In-Reply-To: <20230103170058.810597-14-benjamin.gaignard@collabora.com>
On Tue, Jan 3, 2023 at 2:01 PM Benjamin Gaignard
<benjamin.gaignard@collabora.com> wrote:
>
> AV1 film grain feature requires to use the postprocessor to produce
> valid frames. In such case the driver shouldn't propose native pixels
> format but only post-processed pixels format.
> If a codec set need_postproc field in hantro_ctx structure to true
> native pixel formats will be ignored.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> ---
> drivers/media/platform/verisilicon/hantro.h | 3 ++
> .../media/platform/verisilicon/hantro_drv.c | 5 ++
> .../platform/verisilicon/hantro_postproc.c | 4 ++
> .../media/platform/verisilicon/hantro_v4l2.c | 46 +++++++++++++------
> 4 files changed, 45 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h
> index a98cb40a8d3b..7a5357e810fb 100644
> --- a/drivers/media/platform/verisilicon/hantro.h
> +++ b/drivers/media/platform/verisilicon/hantro.h
> @@ -231,6 +231,8 @@ struct hantro_dev {
> * @ctrl_handler: Control handler used to register controls.
> * @jpeg_quality: User-specified JPEG compression quality.
> * @bit_depth: Bit depth of current frame
> + * @need_postproc: Set to true if the bitstream features require to
> + * use the post-processor.
> *
> * @codec_ops: Set of operations related to codec mode.
> * @postproc: Post-processing context.
> @@ -258,6 +260,7 @@ struct hantro_ctx {
> struct v4l2_ctrl_handler ctrl_handler;
> int jpeg_quality;
> int bit_depth;
> + bool need_postproc;
>
> const struct hantro_codec_ops *codec_ops;
> struct hantro_postproc_ctx postproc;
> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
> index 4fc6dea16ae6..8d7055c0bf3b 100644
> --- a/drivers/media/platform/verisilicon/hantro_drv.c
> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
> @@ -346,6 +346,11 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl)
> return -EINVAL;
>
> ctx->bit_depth = bit_depth;
> +
> + if (ctrl->p_new.p_av1_sequence->flags
> + & V4L2_AV1_SEQUENCE_FLAG_FILM_GRAIN_PARAMS_PRESENT)
> + ctx->need_postproc = true;
> +
> break;
> default:
> return -EINVAL;
> diff --git a/drivers/media/platform/verisilicon/hantro_postproc.c b/drivers/media/platform/verisilicon/hantro_postproc.c
> index 7dc39519a2ee..293e5612e2ce 100644
> --- a/drivers/media/platform/verisilicon/hantro_postproc.c
> +++ b/drivers/media/platform/verisilicon/hantro_postproc.c
> @@ -57,6 +57,10 @@ bool hantro_needs_postproc(const struct hantro_ctx *ctx,
> {
> if (ctx->is_encoder)
> return false;
> +
> + if (ctx->need_postproc)
> + return true;
> +
> return fmt->postprocessed;
> }
>
> diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c
> index bbe79dbd2cd9..5c381766cca3 100644
> --- a/drivers/media/platform/verisilicon/hantro_v4l2.c
> +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c
> @@ -38,6 +38,11 @@ hantro_get_formats(const struct hantro_ctx *ctx, unsigned int *num_fmts)
> {
> const struct hantro_fmt *formats;
>
> + if (ctx->need_postproc) {
> + *num_fmts = 0;
> + return NULL;
> + }
> +
> if (ctx->is_encoder) {
> formats = ctx->dev->variant->enc_fmts;
> *num_fmts = ctx->dev->variant->num_enc_fmts;
> @@ -132,6 +137,15 @@ hantro_get_default_fmt(const struct hantro_ctx *ctx, bool bitstream)
> hantro_check_depth_match(ctx, &formats[i]))
> return &formats[i];
> }
> +
> + formats = hantro_get_postproc_formats(ctx, &num_fmts);
> + for (i = 0; i < num_fmts; i++) {
> + if (bitstream == (formats[i].codec_mode !=
> + HANTRO_MODE_NONE) &&
> + hantro_check_depth_match(ctx, &formats[i]))
> + return &formats[i];
> + }
> +
> return NULL;
> }
>
> @@ -261,19 +275,6 @@ static int vidioc_g_fmt_out_mplane(struct file *file, void *priv,
> return 0;
> }
>
> -static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
> - struct v4l2_format *f)
> -{
> - struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
> - struct hantro_ctx *ctx = fh_to_ctx(priv);
> -
> - vpu_debug(4, "f->type = %d\n", f->type);
> -
> - *pix_mp = ctx->dst_fmt;
> -
> - return 0;
> -}
> -
> static int hantro_try_fmt(const struct hantro_ctx *ctx,
> struct v4l2_pix_format_mplane *pix_mp,
> enum v4l2_buf_type type)
> @@ -353,6 +354,25 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,
> return 0;
> }
>
> +static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
> + struct v4l2_format *f)
> +{
> + struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
> + struct hantro_ctx *ctx = fh_to_ctx(priv);
> + int ret;
> +
> + vpu_debug(4, "f->type = %d\n", f->type);
> +
> + ret = hantro_try_fmt(ctx, pix_mp, f->type);
> + if (ret)
> + return ret;
> +
> + ctx->vpu_dst_fmt = hantro_find_format(ctx, pix_mp->pixelformat);
> + ctx->dst_fmt = *pix_mp;
> +
This looks like the g_fmt is setting some state in the context,
this looks incorrect.
Thanks,
Ezequiel
next prev parent reply other threads:[~2023-01-08 21:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 17:00 [PATCH v2 00/13] AV1 stateless decoder for RK3588 Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 01/13] dt-bindings: media: rockchip-vpu: Add rk3588 vpu compatible Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 02/13] v4l2-common: Add support for fractional bpp Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 03/13] media: Add NV12_10LE40_4L4 pixel format Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 04/13] media: verisilicon: Get bit depth for V4L2_PIX_FMT_NV12_10LE40_4L4 Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 05/13] media: verisilicon: Add AV1 decoder mode and controls Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 06/13] media: verisilicon: Save bit depth for AV1 decoder Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 07/13] media: verisilicon: Check AV1 bitstreams bit depth Benjamin Gaignard
2023-01-04 19:21 ` kernel test robot
2023-01-04 19:33 ` Ezequiel Garcia
2023-01-05 7:52 ` Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 08/13] media: verisilicon: Compute motion vectors size for AV1 frames Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 09/13] media: verisilicon: Add AV1 entropy helpers Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 10/13] media: verisilicon: Add Rockchip AV1 decoder Benjamin Gaignard
2023-01-03 20:11 ` kernel test robot
2023-01-06 7:33 ` Dan Carpenter
2023-01-06 8:22 ` Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 11/13] media: verisilicon: Add film grain feature to AV1 driver Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 12/13] media: verisilicon: Enable AV1 decoder on rk3588 Benjamin Gaignard
2023-01-03 17:00 ` [PATCH v2 13/13] media: verisilicon: Conditionnaly ignore native formats Benjamin Gaignard
2023-01-08 21:12 ` Ezequiel Garcia [this message]
2023-01-09 9:05 ` Benjamin Gaignard
2023-01-10 19:28 ` Ezequiel Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAAEAJfBRtBSZt0B3OyQSCHhsseUn6_H+JSvAR3cOH15WUryuNw@mail.gmail.com \
--to=ezequiel@vanguardiasur.com.ar \
--cc=benjamin.gaignard@collabora.com \
--cc=daniel.almeida@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=kernel@collabora.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=nicolas.dufresne@collabora.co.uk \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).