From: Jonas Karlman <jonas@kwiboo.se>
To: Sebastian Fricke <sebastian.fricke@collabora.com>,
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Boris Brezillon <boris.brezillon@collabora.com>
Cc: Alex Bee <knaerzche@gmail.com>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Detlev Casanova <detlev.casanova@collabora.com>,
Dan Carpenter <dan.carpenter@linaro.org>,
linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Jonas Karlman <jonas@kwiboo.se>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: [PATCH v6 11/11] media: rkvdec: Fix enumerate frame sizes
Date: Mon, 9 Sep 2024 19:25:09 +0000 [thread overview]
Message-ID: <20240909192522.1076704-12-jonas@kwiboo.se> (raw)
In-Reply-To: <20240909192522.1076704-1-jonas@kwiboo.se>
The VIDIOC_ENUM_FRAMESIZES ioctl should return all frame sizes (i. e.
width and height in pixels) that the device supports for the given pixel
format.
For coded format returning the frame size used to enforce HW alignment
requirements for CAPTURE buffers does not make fully sense.
Instead, signal applications what the maximum frame size that is
supported by the HW decoder using a frame size of continuous type.
Fixes: cd33c830448b ("media: rkvdec: Add the rkvdec driver")
Suggested-by: Alex Bee <knaerzche@gmail.com>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
v6:
- New patch
With this change FFmpeg V4L2 Request API hwaccels can implement a strict
check if frame size is supported by the video device:
https://ffmpeg.org/pipermail/ffmpeg-devel/2024-August/332037.html
---
drivers/staging/media/rkvdec/rkvdec.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
index c8c14f35ac44..9002eb3a59e5 100644
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -334,8 +334,14 @@ static int rkvdec_enum_framesizes(struct file *file, void *priv,
if (!fmt)
return -EINVAL;
- fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
- fsize->stepwise = fmt->frmsize;
+ fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
+ fsize->stepwise.min_width = 1;
+ fsize->stepwise.max_width = fmt->frmsize.max_width;
+ fsize->stepwise.step_width = 1;
+ fsize->stepwise.min_height = 1;
+ fsize->stepwise.max_height = fmt->frmsize.max_height;
+ fsize->stepwise.step_height = 1;
+
return 0;
}
--
2.46.0
next prev parent reply other threads:[~2024-09-09 19:26 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 19:24 [PATCH v6 00/11] media: rkvdec: Add H.264 High 10 and 4:2:2 profile support Jonas Karlman
2024-09-09 19:24 ` [PATCH v6 01/11] media: v4l2-common: Add helpers to calculate bytesperline and sizeimage Jonas Karlman
2024-10-25 17:20 ` Nicolas Dufresne
2024-09-09 19:25 ` [PATCH v6 02/11] media: v4l2: Add NV15 and NV20 pixel formats Jonas Karlman
2024-10-25 17:31 ` Nicolas Dufresne
2024-09-09 19:25 ` [PATCH v6 03/11] media: rkvdec: h264: Use bytesperline and buffer height as virstride Jonas Karlman
2024-09-09 19:25 ` [PATCH v6 04/11] media: rkvdec: h264: Don't hardcode SPS/PPS parameters Jonas Karlman
2024-09-09 19:25 ` [PATCH v6 05/11] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt into helper Jonas Karlman
2024-09-09 19:25 ` [PATCH v6 06/11] media: rkvdec: Move rkvdec_reset_decoded_fmt helper Jonas Karlman
2024-09-09 19:25 ` [PATCH v6 07/11] media: rkvdec: Extract decoded format enumeration into helper Jonas Karlman
2024-09-09 19:25 ` [PATCH v6 08/11] media: rkvdec: Add image format concept Jonas Karlman
2024-09-10 9:41 ` Dan Carpenter
2024-10-25 17:36 ` Nicolas Dufresne
2024-09-09 19:25 ` [PATCH v6 09/11] media: rkvdec: Add get_image_fmt ops Jonas Karlman
2024-10-25 17:38 ` Nicolas Dufresne
2024-09-09 19:25 ` [PATCH v6 10/11] media: rkvdec: h264: Support High 10 and 4:2:2 profiles Jonas Karlman
2024-10-25 17:45 ` Nicolas Dufresne
2024-09-09 19:25 ` Jonas Karlman [this message]
2024-10-25 17:46 ` [PATCH v6 11/11] media: rkvdec: Fix enumerate frame sizes Nicolas Dufresne
2024-10-03 12:23 ` [PATCH v6 00/11] media: rkvdec: Add H.264 High 10 and 4:2:2 profile support Diederik de Haas
2024-10-25 8:20 ` Jonas Karlman
2024-10-25 10:30 ` Sebastian Fricke
2024-10-25 12:54 ` Nicolas Dufresne
2024-10-25 17:47 ` Nicolas Dufresne
2024-10-25 20:13 ` Jonas Karlman
2024-11-07 15:11 ` Nicolas Dufresne
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=20240909192522.1076704-12-jonas@kwiboo.se \
--to=jonas@kwiboo.se \
--cc=benjamin.gaignard@collabora.com \
--cc=boris.brezillon@collabora.com \
--cc=dan.carpenter@linaro.org \
--cc=detlev.casanova@collabora.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=knaerzche@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=sebastian.fricke@collabora.com \
/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