On 10/10/23 04:21, Yunke Cao wrote:
> This control represents a generic read/write rectangle.
> It supports V4L2_CTRL_WHICH_MIN/MAX_VAL.
No SOB!
With that added:
Reviewed-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Regards,
Hans
> ---
> .../media/test-drivers/vivid/vivid-ctrls.c | 34 +++++++++++++++++++
> 1 file changed, 34 insertions(+)
>
> diff --git a/drivers/media/test-drivers/vivid/vivid-ctrls.c b/drivers/media/test-drivers/vivid/vivid-ctrls.c
> index f2b20e25a7a4..27a1173c7734 100644
> --- a/drivers/media/test-drivers/vivid/vivid-ctrls.c
> +++ b/drivers/media/test-drivers/vivid/vivid-ctrls.c
> @@ -38,6 +38,7 @@
> #define VIVID_CID_U8_PIXEL_ARRAY (VIVID_CID_CUSTOM_BASE + 14)
> #define VIVID_CID_S32_ARRAY (VIVID_CID_CUSTOM_BASE + 15)
> #define VIVID_CID_S64_ARRAY (VIVID_CID_CUSTOM_BASE + 16)
> +#define VIVID_CID_RECT (VIVID_CID_CUSTOM_BASE + 17)
>
> #define VIVID_CID_VIVID_BASE (0x00f00000 | 0xf000)
> #define VIVID_CID_VIVID_CLASS (0x00f00000 | 1)
> @@ -357,6 +358,38 @@ static const struct v4l2_ctrl_config vivid_ctrl_ro_int32 = {
> .step = 1,
> };
>
> +static const struct v4l2_rect rect_def = {
> + .top = 100,
> + .left = 200,
> + .width = 300,
> + .height = 400,
> +};
> +
> +static const struct v4l2_rect rect_min = {
> + .top = 0,
> + .left = 0,
> + .width = 1,
> + .height = 1,
> +};
> +
> +static const struct v4l2_rect rect_max = {
> + .top = 0,
> + .left = 0,
> + .width = 1000,
> + .height = 2000,
> +};
> +
> +static const struct v4l2_ctrl_config vivid_ctrl_rect = {
> + .ops = &vivid_user_gen_ctrl_ops,
> + .id = VIVID_CID_RECT,
> + .name = "Rect",
> + .type = V4L2_CTRL_TYPE_RECT,
> + .flags = V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX,
> + .p_def.p_const = &rect_def,
> + .p_min.p_const = &rect_min,
> + .p_max.p_const = &rect_max,
> +};
> +
> /* Framebuffer Controls */
>
> static int vivid_fb_s_ctrl(struct v4l2_ctrl *ctrl)
> @@ -1677,6 +1710,7 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,
> dev->int_menu = v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_int_menu, NULL);
> dev->ro_int32 = v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_ro_int32, NULL);
> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_area, NULL);
> + v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_rect, NULL);
> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u32_array, NULL);
> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u32_dyn_array, NULL);
> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u16_matrix, NULL);
