Skip to contentSkip to conversation

media: v4l2-ctrl: Add p_def to v4l2_ctrl_config

PATCH Superseded Ricardo Ribalda Delgado 2 participants 10 messages Oct 14, 2019 – Oct 16, 2019 Media (V4L/DVB)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 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 | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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
index 26205ba3a0a0..2fca5b823961 100644
@@ -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;
+	union v4l2_ctrl_ptr p_def;
 	u32 dims[V4L2_CTRL_MAX_DIMS];
 	u32 elem_size;
 	u32 flags;
Signature · 1 line
2.23.0
#1 lore raw
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#2 lore raw

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#3 lore raw
Quoted 5 lines · Ricardo Ribalda Delgado

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Well, a struct v4l2_ctrl_config is typically a static const, so you can't use v4l2_ctrl_ptr_create().

Hmm, perhaps it is as easy as:

static const struct v4l2_area def_area = {
	...
};
static const struct v4l2_ctrl_config ctrl = {
	...

	.p_def.p_area = &def_area,
	...
};

Can you do a quick compile check that I am not overlooking anything?

If this works, then I'll take this patch.

Regards,

Hans

Quoted 57 lines

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#4 lore raw

Hi Hans:

Quoted 24 lines · Hans Verkuil
Quoted 5 lines · Ricardo Ribalda Delgado

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Well, a struct v4l2_ctrl_config is typically a static const, so you can't use v4l2_ctrl_ptr_create().

Hmm, perhaps it is as easy as:

static const struct v4l2_area def_area = {
        ...
};
static const struct v4l2_ctrl_config ctrl = {
        ...

        .p_def.p_area = &def_area,
        ...
};
Quoted 3 lines

Can you do a quick compile check that I am not overlooking anything?

If this works, then I'll take this patch.

Testing with gcc 9.2.1

This works fine, no warning/error:

static struct v4l2_area unit_size = {
.width = UNIT_SIZE,
.height = UNIT_SIZE,
};
static struct v4l2_ctrl_config area_ctrl = {
.type = V4L2_CTRL_TYPE_AREA,
.flags = V4L2_CTRL_FLAG_READ_ONLY,
.p_def.p_area = &unit_size,
};

but if unit_size is set as CONST:
static const struct v4l2_area

Then:
drivers/qtec/qtec_sony.c: In function ‘qtec_sony_probe’:
drivers/qtec/qtec_sony.c:3151:19: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
3151 | .p_def.p_area = &unit_size,

      |
Quoted 63 lines

Regards,

Hans

Quoted 57 lines

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#5 lore raw
Quoted 48 lines · Ricardo Ribalda Delgado

Hi Hans:

Quoted 24 lines · Hans Verkuil
Quoted 5 lines · Ricardo Ribalda Delgado

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Well, a struct v4l2_ctrl_config is typically a static const, so you can't use v4l2_ctrl_ptr_create().

Hmm, perhaps it is as easy as:

static const struct v4l2_area def_area = {
        ...
};
static const struct v4l2_ctrl_config ctrl = {
        ...

        .p_def.p_area = &def_area,
        ...
};
Quoted 3 lines

Can you do a quick compile check that I am not overlooking anything?

If this works, then I'll take this patch.

Testing with gcc 9.2.1

This works fine, no warning/error:

static struct v4l2_area unit_size = {
.width = UNIT_SIZE,
.height = UNIT_SIZE,
};
static struct v4l2_ctrl_config area_ctrl = {
.type = V4L2_CTRL_TYPE_AREA,
.flags = V4L2_CTRL_FLAG_READ_ONLY,
.p_def.p_area = &unit_size,
};

but if unit_size is set as CONST:
static const struct v4l2_area

Quoted 6 lines

Then:
drivers/qtec/qtec_sony.c: In function ‘qtec_sony_probe’:
drivers/qtec/qtec_sony.c:3151:19: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
3151 | .p_def.p_area = &unit_size,

      |

Hmm. So we need a const void *p_def instead.

Regards,

Hans

Quoted 64 lines
Quoted 64 lines

Regards,

Hans

Quoted 57 lines

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#6 lore raw
Quoted 49 lines · Hans Verkuil
Quoted 48 lines · Ricardo Ribalda Delgado

Hi Hans:

Quoted 24 lines · Hans Verkuil
Quoted 5 lines · Ricardo Ribalda Delgado

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Well, a struct v4l2_ctrl_config is typically a static const, so you can't use v4l2_ctrl_ptr_create().

Hmm, perhaps it is as easy as:

static const struct v4l2_area def_area = {
        ...
};
static const struct v4l2_ctrl_config ctrl = {
        ...

        .p_def.p_area = &def_area,
        ...
};
Quoted 3 lines

Can you do a quick compile check that I am not overlooking anything?

If this works, then I'll take this patch.

Testing with gcc 9.2.1

This works fine, no warning/error:

static struct v4l2_area unit_size = {
.width = UNIT_SIZE,
.height = UNIT_SIZE,
};
static struct v4l2_ctrl_config area_ctrl = {
.type = V4L2_CTRL_TYPE_AREA,
.flags = V4L2_CTRL_FLAG_READ_ONLY,
.p_def.p_area = &unit_size,
};

but if unit_size is set as CONST:
static const struct v4l2_area

Quoted 8 lines
Quoted 6 lines

Then:
drivers/qtec/qtec_sony.c: In function ‘qtec_sony_probe’:
drivers/qtec/qtec_sony.c:3151:19: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
3151 | .p_def.p_area = &unit_size,

      |

Hmm. So we need a const void *p_def instead.

Ah, v4l2_ctrl_ptr_create() expects a non-const pointer.

What happens if union v4l2_ctrl_ptr p_def; in struct v4l2_ctrl changes to const union v4l2_ctrl_ptr p_def; ?

You'll need to add const elsewhere as well, but since the default value is const, this might work.

I'm not entirely sure this is correct code, though, but it's worth trying it.

Regards,

Hans

Quoted 70 lines

Regards,

Hans

Quoted 64 lines
Quoted 64 lines

Regards,

Hans

Quoted 57 lines

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#7 lore raw

Hi Hans

Quoted 62 lines · Hans Verkuil
Quoted 49 lines · Hans Verkuil
Quoted 48 lines · Ricardo Ribalda Delgado

Hi Hans:

Quoted 24 lines · Hans Verkuil
Quoted 5 lines · Ricardo Ribalda Delgado

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Well, a struct v4l2_ctrl_config is typically a static const, so you can't use v4l2_ctrl_ptr_create().

Hmm, perhaps it is as easy as:

static const struct v4l2_area def_area = {
        ...
};
static const struct v4l2_ctrl_config ctrl = {
        ...

        .p_def.p_area = &def_area,
        ...
};
Quoted 3 lines

Can you do a quick compile check that I am not overlooking anything?

If this works, then I'll take this patch.

Testing with gcc 9.2.1

This works fine, no warning/error:

static struct v4l2_area unit_size = {
.width = UNIT_SIZE,
.height = UNIT_SIZE,
};
static struct v4l2_ctrl_config area_ctrl = {
.type = V4L2_CTRL_TYPE_AREA,
.flags = V4L2_CTRL_FLAG_READ_ONLY,
.p_def.p_area = &unit_size,
};

but if unit_size is set as CONST:
static const struct v4l2_area

Quoted 8 lines
Quoted 6 lines

Then:
drivers/qtec/qtec_sony.c: In function ‘qtec_sony_probe’:
drivers/qtec/qtec_sony.c:3151:19: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
3151 | .p_def.p_area = &unit_size,

      |

Hmm. So we need a const void *p_def instead.

Ah, v4l2_ctrl_ptr_create() expects a non-const pointer.

Quoted 9 lines

What happens if union v4l2_ctrl_ptr p_def; in struct v4l2_ctrl changes to const union v4l2_ctrl_ptr p_def; ?

You'll need to add const elsewhere as well, but since the default value is const, this might work.

I'm not entirely sure this is correct code, though, but it's worth trying it.

This might be tricky. p_def needs to be allocated "in run time", and we need to set p_def afterwards.
I am afraid we will get a " assignment of read-only member" error

Quoted 75 lines

Regards,

Hans

Quoted 70 lines

Regards,

Hans

Quoted 64 lines
Quoted 64 lines

Regards,

Hans

Quoted 57 lines

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#8 lore raw
In reply to Hans Verkuil

Hi Hans

Quoted 50 lines · Hans Verkuil
Quoted 48 lines · Ricardo Ribalda Delgado

Hi Hans:

Quoted 24 lines · Hans Verkuil
Quoted 5 lines · Ricardo Ribalda Delgado

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Well, a struct v4l2_ctrl_config is typically a static const, so you can't use v4l2_ctrl_ptr_create().

Hmm, perhaps it is as easy as:

static const struct v4l2_area def_area = {
        ...
};
static const struct v4l2_ctrl_config ctrl = {
        ...

        .p_def.p_area = &def_area,
        ...
};
Quoted 3 lines

Can you do a quick compile check that I am not overlooking anything?

If this works, then I'll take this patch.

Testing with gcc 9.2.1

This works fine, no warning/error:

static struct v4l2_area unit_size = {
.width = UNIT_SIZE,
.height = UNIT_SIZE,
};
static struct v4l2_ctrl_config area_ctrl = {
.type = V4L2_CTRL_TYPE_AREA,
.flags = V4L2_CTRL_FLAG_READ_ONLY,
.p_def.p_area = &unit_size,
};

but if unit_size is set as CONST:
static const struct v4l2_area

Quoted 9 lines
Quoted 6 lines

Then:
drivers/qtec/qtec_sony.c: In function ‘qtec_sony_probe’:
drivers/qtec/qtec_sony.c:3151:19: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
3151 | .p_def.p_area = &unit_size,

      |

Hmm. So we need a const void *p_def instead.

If we make p_def in ctrl_config const then this will fail:

drivers/qtec/qtec_sony.c:3273:18: error: assignment of read-only member ‘p_def’
3273 | area_ctrl.p_def = v4l2_ctrl_ptr_create((void *)&unit_size);

I think we need to leave it as in the proposed patch.

Quoted 69 lines

Regards,

Hans

Quoted 64 lines
Quoted 64 lines

Regards,

Hans

Quoted 57 lines

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans

#9 lore raw
Quoted 60 lines · Ricardo Ribalda Delgado

Hi Hans

Quoted 57 lines · Hans Verkuil
Quoted 54 lines · Ricardo Ribalda Delgado

Hi Hans:

Quoted 24 lines · Hans Verkuil
Quoted 5 lines · Ricardo Ribalda Delgado

Hi Hans

Not that awkward, the user has to use the brand new v4l2_ctrl_ptr_create() ;). But if you prefer void * I can make the change.

Well, a struct v4l2_ctrl_config is typically a static const, so you can't use v4l2_ctrl_ptr_create().

Hmm, perhaps it is as easy as:

static const struct v4l2_area def_area = {
        ...
};
static const struct v4l2_ctrl_config ctrl = {
        ...

        .p_def.p_area = &def_area,
        ...
};
Quoted 3 lines

Can you do a quick compile check that I am not overlooking anything?

If this works, then I'll take this patch.

Testing with gcc 9.2.1

This works fine, no warning/error:

static struct v4l2_area unit_size = {
.width = UNIT_SIZE,
.height = UNIT_SIZE,
};
static struct v4l2_ctrl_config area_ctrl = {
.type = V4L2_CTRL_TYPE_AREA,
.flags = V4L2_CTRL_FLAG_READ_ONLY,
.p_def.p_area = &unit_size,
};

but if unit_size is set as CONST:
static const struct v4l2_area

Then:
drivers/qtec/qtec_sony.c: In function ‘qtec_sony_probe’:
drivers/qtec/qtec_sony.c:3151:19: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
3151 | .p_def.p_area = &unit_size,

      |
Quoted 7 lines
Quoted 2 lines

Hmm. So we need a const void *p_def instead.

If we make p_def in ctrl_config const then this will fail:

drivers/qtec/qtec_sony.c:3273:18: error: assignment of read-only member ‘p_def’
3273 | area_ctrl.p_def = v4l2_ctrl_ptr_create((void *)&unit_size);

area_ctrl should be const as well, I think. And then initialize this field in the structure with .p_def.p_area = &unit_size,

Regards,

Hans

Quoted 73 lines

I think we need to leave it as in the proposed patch.

Quoted 69 lines

Regards,

Hans

Quoted 64 lines
Quoted 64 lines

Regards,

Hans

Quoted 57 lines

Regards

Quoted 53 lines · Hans Verkuil
Quoted 36 lines · Ricardo Ribalda Delgado

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

---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +1 -1
index bf50d37ef6c1..12cf38f73f7b 100644
@@ -2583,7 +2583,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 +1 -0
index 26205ba3a0a0..2fca5b823961 100644
@@ -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.

include/media/v4l2-ctrls.h struct v4l2_ctrl_config { · line 410

Quoted 7 lines
include/media/v4l2-ctrls.h +1 -0
@@ -403,6 +404,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;

I'm not sure about this. It might be a bit awkward to initialize p_def given that it is a union.

Perhaps a simple void pointer would be easier?

Regards,

Hans