media: v4l2-ctrl: Add p_def to v4l2_ctrl_config
PATCH v2 1/1 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.
--- drivers/media/v4l2-core/v4l2-ctrls.c | 3 ++- include/media/v4l2-ctrls.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +2 -1
@@ -2583,7 +2583,8 @@ 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, + v4l2_ctrl_ptr_create((void *)cfg->p_def), priv);if (ctrl) ctrl->is_private = cfg->is_private;return ctrl;
include/media/v4l2-ctrls.h +2 -0
@@ -375,6 +375,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.
@@ -403,6 +404,7 @@ struct v4l2_ctrl_config {s64 max;u64 step;s64 def; +const void *p_def;u32 dims[V4L2_CTRL_MAX_DIMS ];u32 elem_size;u32 flags;
Signature · 1 line
2.23.0
Quoted 14 lines · Ricardo Ribalda Delgado
This allows setting the default value on compound controls created via
v4l2_ctrl_new_custom.Signed-off-by Ricardo Ribalda Delgado <[email protected]>--- drivers/media/v4l2-core/v4l2-ctrls.c | 3 ++- include/media/v4l2-ctrls.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)drivers/media/v4l2-core/v4l2-ctrls.c +0
-0
drivers/media/v4l2-core/v4l2-ctrls.c struct v4l2_ctrl *v4l2_ctrl_new_custom(struct v4l2_ctrl_handler *hdl, · line 2587
Quoted 6 lines
drivers/media/v4l2-core/v4l2-ctrls.c +2
-1@@ -2583,7 +2583,8 @@ 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, + v4l2_ctrl_ptr_create((void *)cfg->p_def), priv);
I don't like this cast. I've been experimenting a bit and this works fine:
#include <stdlib.h>
#include <stdio.h>
union v4l2_ctrl_ptr {
int *p_int;
const int *p_int_const;
};struct v4l2_ctrl_config {
union v4l2_ctrl_ptr p;
};static const int i = 5;
static const struct v4l2_ctrl_config c = {
.p.p_int_const = &i,
};int main(int argc, char **argv)
{
printf("%d\n", *c.p.p_int_const);
return 0;
}So I would like to see a p_const being added to the union, and I think we need a v4l2_ctrl_const_ptr_create() helper.
In a separate patch it would be really nice to replace any uses of .p with .p_const where possible to signal that the contents isn't modified.
Regards,
Hans
Quoted 24 lines
drivers/media/v4l2-core/v4l2-ctrls.c +0
-0if (ctrl) ctrl->is_private = cfg->is_private;return ctrl;include/media/v4l2-ctrls.h +2
-0@@ -375,6 +375,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. @@ -403,6 +404,7 @@ struct v4l2_ctrl_config {s64 max;u64 step;s64 def; +const void *p_def;u32 dims[V4L2_CTRL_MAX_DIMS ];u32 elem_size;u32 flags;