From: Jernej Skrabec <jernej.skrabec@gmail.com>
To: mripard@kernel.org, paul.kocialkowski@bootlin.com
Cc: mchehab@kernel.org, gregkh@linuxfoundation.org, wens@csie.org,
samuel@sholland.org, hverkuil-cisco@xs4all.nl,
linux-media@vger.kernel.org, linux-staging@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org,
Jernej Skrabec <jernej.skrabec@gmail.com>
Subject: [PATCH 10/11] media: cedrus: Adjust buffer size based on control values
Date: Mon, 24 Oct 2022 22:15:14 +0200 [thread overview]
Message-ID: <20221024201515.34129-11-jernej.skrabec@gmail.com> (raw)
In-Reply-To: <20221024201515.34129-1-jernej.skrabec@gmail.com>
In some cases decoding engine needs extra space in capture buffers. This
is the case for decoding 10-bit HEVC frames into 8-bit capture format.
This commit only adds infrastructure for such cases.
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
drivers/staging/media/sunxi/cedrus/cedrus.c | 14 ++++++++++++++
drivers/staging/media/sunxi/cedrus/cedrus.h | 2 ++
drivers/staging/media/sunxi/cedrus/cedrus_video.c | 4 ++++
3 files changed, 20 insertions(+)
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index 70b07d8bad2b..fbe3b2e7c1d4 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -68,8 +68,22 @@ static int cedrus_try_ctrl(struct v4l2_ctrl *ctrl)
return 0;
}
+static int cedrus_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+ struct cedrus_ctx *ctx = container_of(ctrl->handler,
+ struct cedrus_ctx, hdl);
+ struct vb2_queue *vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
+ V4L2_BUF_TYPE_VIDEO_CAPTURE);
+
+ if (!vb2_is_busy(vq) && !vb2_is_streaming(vq))
+ cedrus_reset_cap_format(ctx);
+
+ return 0;
+}
+
static const struct v4l2_ctrl_ops cedrus_ctrl_ops = {
.try_ctrl = cedrus_try_ctrl,
+ .s_ctrl = cedrus_s_ctrl,
};
static const struct cedrus_control cedrus_controls[] = {
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
index 5904294f3108..774fe8048ce3 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -162,6 +162,8 @@ struct cedrus_dec_ops {
int (*start)(struct cedrus_ctx *ctx);
void (*stop)(struct cedrus_ctx *ctx);
void (*trigger)(struct cedrus_ctx *ctx);
+ unsigned int (*extra_cap_size)(struct cedrus_ctx *ctx,
+ struct v4l2_pix_format *pix_fmt);
};
struct cedrus_variant {
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
index f9f723ea3f79..53e65f74046b 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -251,6 +251,10 @@ static int cedrus_try_fmt_vid_cap_p(struct cedrus_ctx *ctx,
pix_fmt->height = ctx->src_fmt.height;
cedrus_prepare_format(pix_fmt);
+ if (ctx->current_codec->extra_cap_size)
+ pix_fmt->sizeimage +=
+ ctx->current_codec->extra_cap_size(ctx, pix_fmt);
+
return 0;
}
--
2.38.1
next prev parent reply other threads:[~2022-10-24 23:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-24 20:15 [PATCH 00/11] media: cedrus: Format handling improvements and 10-bit HEVC support Jernej Skrabec
2022-10-24 20:15 ` [PATCH 01/11] media: cedrus: remove superfluous call Jernej Skrabec
2022-10-25 15:08 ` Paul Kocialkowski
2022-10-24 20:15 ` [PATCH 02/11] media: cedrus: Add format reset helpers Jernej Skrabec
2022-10-24 20:15 ` [PATCH 03/11] media: cedrus: use helper to set default formats Jernej Skrabec
2022-10-24 20:15 ` [PATCH 04/11] media: cedrus: Add helper for checking capabilities Jernej Skrabec
2022-10-25 6:30 ` Dan Carpenter
2022-10-25 15:17 ` Jernej Škrabec
2022-10-25 15:22 ` Paul Kocialkowski
2022-10-25 15:28 ` Jernej Škrabec
2022-10-25 15:35 ` Paul Kocialkowski
2022-10-24 20:15 ` [PATCH 05/11] media: cedrus: Filter controls based on capability Jernej Skrabec
2022-10-25 15:16 ` Paul Kocialkowski
2022-11-01 22:56 ` Jernej Škrabec
2022-10-24 20:15 ` [PATCH 06/11] media: cedrus: set codec ops immediately Jernej Skrabec
2022-10-25 14:59 ` Paul Kocialkowski
2022-10-24 20:15 ` [PATCH 07/11] media: cedrus: Remove cedrus_codec enum Jernej Skrabec
2022-10-25 15:03 ` Paul Kocialkowski
2022-10-24 20:15 ` [PATCH 08/11] media: cedrus: prefer untiled capture format Jernej Skrabec
2022-10-25 15:05 ` Paul Kocialkowski
2022-10-25 15:15 ` Jernej Škrabec
2022-10-24 20:15 ` [PATCH 09/11] media: cedrus: initialize controls a bit later Jernej Skrabec
2022-10-24 20:15 ` Jernej Skrabec [this message]
2022-10-24 20:15 ` [PATCH 11/11] media: cedrus: h265: Support decoding 10-bit frames Jernej Skrabec
2022-10-25 6:55 ` [PATCH 00/11] media: cedrus: Format handling improvements and 10-bit HEVC support Dan Carpenter
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=20221024201515.34129-11-jernej.skrabec@gmail.com \
--to=jernej.skrabec@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=paul.kocialkowski@bootlin.com \
--cc=samuel@sholland.org \
--cc=wens@csie.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