Commit 3b98a21a authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Mauro Carvalho Chehab
Browse files

media: v4l2_ctrl: Add p_def to v4l2_ctrl_config 



This allows setting the default value on compound controls created via
v4l2_ctrl_new_custom.

Signed-off-by: default avatarRicardo Ribalda Delgado <ribalda@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 4d741cbd

drivers/media/v4l2-core/v4l2-ctrls.c

+1 −1
Original line number Diff line number Diff line
@@ -2690,7 +2690,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(struct v4l2_ctrl_handler *hdl, 
			type, min, max,

			is_menu ? cfg->menu_skip_mask : step, def,

			cfg->dims, cfg->elem_size,

			flags, qmenu, qmenu_int, ptr_null, priv);

			flags, qmenu, qmenu_int, cfg->p_def, priv);

	if (ctrl)

		ctrl->is_private = cfg->is_private;

	return ctrl;

include/media/v4l2-ctrls.h

+2 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ struct v4l2_ctrl_handler { 
 * @max:	The control's maximum value.

 * @step:	The control's step value for non-menu controls.

 * @def:	The control's default value.

 * @p_def:	The control's default value for compound controls.

 * @dims:	The size of each dimension.

 * @elem_size:	The size in bytes of the control.

 * @flags:	The control's flags.
@@ -410,6 +411,7 @@ struct v4l2_ctrl_config { 
	s64 max;

	u64 step;

	s64 def;

	union v4l2_ctrl_ptr p_def;

	u32 dims[V4L2_CTRL_MAX_DIMS];

	u32 elem_size;

	u32 flags;