Commit e17d0269 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: vivid: add dynamic array test control 



Add a dynamic array test control to help test support for this
feature.

Acked-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Tested-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent fb582cba

drivers/media/test-drivers/vivid/vivid-ctrls.c

+15 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define VIVID_CID_U8_4D_ARRAY		(VIVID_CID_CUSTOM_BASE + 10)

#define VIVID_CID_AREA			(VIVID_CID_CUSTOM_BASE + 11)

#define VIVID_CID_RO_INTEGER		(VIVID_CID_CUSTOM_BASE + 12)

#define VIVID_CID_U32_DYN_ARRAY		(VIVID_CID_CUSTOM_BASE + 13)



#define VIVID_CID_VIVID_BASE		(0x00f00000 | 0xf000)

#define VIVID_CID_VIVID_CLASS		(0x00f00000 | 1)
@@ -190,6 +191,19 @@ static const struct v4l2_ctrl_config vivid_ctrl_u32_array = { 
	.dims = { 1 },

};



static const struct v4l2_ctrl_config vivid_ctrl_u32_dyn_array = {

	.ops = &vivid_user_gen_ctrl_ops,

	.id = VIVID_CID_U32_DYN_ARRAY,

	.name = "U32 Dynamic Array",

	.type = V4L2_CTRL_TYPE_U32,

	.flags = V4L2_CTRL_FLAG_DYNAMIC_ARRAY,

	.def = 50,

	.min = 10,

	.max = 90,

	.step = 1,

	.dims = { 100 },

};



static const struct v4l2_ctrl_config vivid_ctrl_u16_matrix = {

	.ops = &vivid_user_gen_ctrl_ops,

	.id = VIVID_CID_U16_MATRIX,
@@ -1625,6 +1639,7 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap, 
	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_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);

	v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u8_4d_array, NULL);