2022-07-20 18:08:29

by Paul Elder

Subject: [PATCH] media: rkisp1: Implement ENUM_FRAMESIZES

Implement VIDIOC_ENUM_FRAMESIZES for the rkisp1 capture devices.

Signed-off-by: Paul Elder <[email protected]>
---
.../platform/rockchip/rkisp1/rkisp1-capture.c | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index c494afbc21b4..74106a01ded7 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -1245,6 +1245,31 @@ static int rkisp1_enum_fmt_vid_cap_mplane(struct file *file, void *priv,
return -EINVAL;
}

+static int rkisp1_enum_framesizes(struct file *file, void *fh,
+ struct v4l2_frmsizeenum *fsize)
+{
+ struct rkisp1_capture *cap = video_drvdata(file);
+ const unsigned int max_widths[] = { RKISP1_RSZ_MP_SRC_MAX_WIDTH,
+ RKISP1_RSZ_SP_SRC_MAX_WIDTH };
+ const unsigned int max_heights[] = { RKISP1_RSZ_MP_SRC_MAX_HEIGHT,
+ RKISP1_RSZ_SP_SRC_MAX_HEIGHT};
+
+ if (fsize->index != 0)
+ return -EINVAL;
+
+ fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
+
+ fsize->stepwise.min_width = RKISP1_RSZ_SRC_MIN_WIDTH;
+ fsize->stepwise.max_width = max_widths[cap->id];
+ fsize->stepwise.step_width = 2;
+
+ fsize->stepwise.min_height = RKISP1_RSZ_SRC_MIN_HEIGHT;
+ fsize->stepwise.max_height = max_heights[cap->id];
+ fsize->stepwise.step_height = 2;
+
+ return 0;
+}
+
static int rkisp1_s_fmt_vid_cap_mplane(struct file *file,
void *priv, struct v4l2_format *f)
{
@@ -1294,6 +1319,7 @@ static const struct v4l2_ioctl_ops rkisp1_v4l2_ioctl_ops = {
.vidioc_s_fmt_vid_cap_mplane = rkisp1_s_fmt_vid_cap_mplane,
.vidioc_g_fmt_vid_cap_mplane = rkisp1_g_fmt_vid_cap_mplane,
.vidioc_enum_fmt_vid_cap = rkisp1_enum_fmt_vid_cap_mplane,
+ .vidioc_enum_framesizes = rkisp1_enum_framesizes,
.vidioc_querycap = rkisp1_querycap,
.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
--
2.30.2

2022-07-21 07:19:39

by Laurent Pinchart

Subject: Re: [PATCH] media: rkisp1: Implement ENUM_FRAMESIZES

Hi Paul,

Thank you for the patch.

On Thu, Jul 21, 2022 at 02:22:31AM +0900, Paul Elder wrote:
> Implement VIDIOC_ENUM_FRAMESIZES for the rkisp1 capture devices.
>
> Signed-off-by: Paul Elder <[email protected]>
> ---
> .../platform/rockchip/rkisp1/rkisp1-capture.c | 26 +++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> index c494afbc21b4..74106a01ded7 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> @@ -1245,6 +1245,31 @@ static int rkisp1_enum_fmt_vid_cap_mplane(struct file *file, void *priv,
> return -EINVAL;
> }
>
> +static int rkisp1_enum_framesizes(struct file *file, void *fh,
> + struct v4l2_frmsizeenum *fsize)
> +{
> + struct rkisp1_capture *cap = video_drvdata(file);
> + const unsigned int max_widths[] = { RKISP1_RSZ_MP_SRC_MAX_WIDTH,
> + RKISP1_RSZ_SP_SRC_MAX_WIDTH };
> + const unsigned int max_heights[] = { RKISP1_RSZ_MP_SRC_MAX_HEIGHT,
> + RKISP1_RSZ_SP_SRC_MAX_HEIGHT};

You can make these static const.

Reviewed-by: Laurent Pinchart <[email protected]>

> +
> + if (fsize->index != 0)
> + return -EINVAL;
> +
> + fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
> +
> + fsize->stepwise.min_width = RKISP1_RSZ_SRC_MIN_WIDTH;
> + fsize->stepwise.max_width = max_widths[cap->id];
> + fsize->stepwise.step_width = 2;
> +
> + fsize->stepwise.min_height = RKISP1_RSZ_SRC_MIN_HEIGHT;
> + fsize->stepwise.max_height = max_heights[cap->id];
> + fsize->stepwise.step_height = 2;
> +
> + return 0;
> +}
> +
> static int rkisp1_s_fmt_vid_cap_mplane(struct file *file,
> void *priv, struct v4l2_format *f)
> {
> @@ -1294,6 +1319,7 @@ static const struct v4l2_ioctl_ops rkisp1_v4l2_ioctl_ops = {
> .vidioc_s_fmt_vid_cap_mplane = rkisp1_s_fmt_vid_cap_mplane,
> .vidioc_g_fmt_vid_cap_mplane = rkisp1_g_fmt_vid_cap_mplane,
> .vidioc_enum_fmt_vid_cap = rkisp1_enum_fmt_vid_cap_mplane,
> + .vidioc_enum_framesizes = rkisp1_enum_framesizes,
> .vidioc_querycap = rkisp1_querycap,
> .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
> .vidioc_unsubscribe_event = v4l2_event_unsubscribe,

--
Regards,

Laurent Pinchart