libv4lcontrol: sync control strings/flags with the kernel
PATCH 2/2 libv4lcontrol: sync control strings/flags with the kernel
Hans,
I'd like your opinion on this. I really don't think the (sw) suffix serves any purpose and is just confusing to the end-user.
If you think that it is important that apps/users know that a control is emulated, then I would propose adding a V4L2_CTRL_FLAG_EMULATED and setting it in libv4lcontrol. Similar to the FMT_FLAG_EMULATED.
Regards,
Hans
The emulated control names and control flags were different from what the kernel uses. Sync them up.
--- lib/libv4lconvert/control/libv4lcontrol.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
lib/libv4lconvert/control/libv4lcontrol.c +8 -8
@@ -788,7 +788,7 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { { .id = V4L2_CID_AUTO_WHITE_BALANCE, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Whitebalance (software)", + .name = "White Balance, Automatic", .minimum = 0, .maximum = 1, .step = 1,
@@ -797,7 +797,7 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CID_HFLIP, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Horizontal flip (sw)", + .name = "Horizontal Flip", .minimum = 0, .maximum = 1, .step = 1,
@@ -806,7 +806,7 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CID_VFLIP, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Vertical flip (sw)", + .name = "Vertical Flip", .minimum = 0, .maximum = 1, .step = 1,
@@ -815,17 +815,17 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CID_GAMMA, .type = V4L2_CTRL_TYPE_INTEGER, - .name = "Gamma (software)", + .name = "Gamma", .minimum = 500, /* == 0.5 */ .maximum = 3000, /* == 3.0 */ .step = 1, .default_value = 1000, /* == 1.0 */ - .flags = 0 + .flags = V4L2_CTRL_FLAG_SLIDER }, { /* Dummy place holder for V4LCONTROL_AUTO_ENABLE_COUNT */ }, { .id = V4L2_CID_AUTOGAIN, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Auto Gain (software)", + .name = "Gain, Automatic", .minimum = 0, .maximum = 1, .step = 1,
@@ -834,12 +834,12 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CTRL_CLASS_USER + 0x2000, /* FIXME */ .type = V4L2_CTRL_TYPE_INTEGER, - .name = "Auto Gain target", + .name = "Auto Gain Target", .minimum = 0, .maximum = 255, .step = 1, .default_value = 100, - .flags =0 + .flags =V4L2_CTRL_FLAG_SLIDER }, };
Signature · 1 line
2.0.0
Quoted 8 lines · Hans Verkuil
Hans,
I'd like your opinion on this. I really don't think the (sw) suffix serves any purpose and is just confusing to the end-user.
If you think that it is important that apps/users know that a control is emulated, then I would propose adding a
V4L2_CTRL_FLAG_EMULATEDand setting it in libv4lcontrol. Similar to theFMT_FLAG_EMULATED.
IMHO it'd be important to know whether something is emulated or not, as emulation such as flipping carries often a significant CPU overhead. Format conversions are "easy" in this respect since not performing the conversion obviously avoids the overhead.
I'm not sure if the information that a control is emulated is useful as such. For instance, how do you tell which choice of an emulated flipping control would avoid the overhead, if the sensor is mounted upside down? In this case the "default", "unflipped" configuration actually is implemented in software. This looks like another field next to default, min, max and step for QUERY_EXT_CTRL to me.
Just my 5 euro cents.
Signature · 4 lines
Kind regards, Sakari Ailus e-mail: [email protected] XMPP: [email protected]
Hi,
Quoted 8 lines · Hans Verkuil
Hans,
I'd like your opinion on this. I really don't think the (sw) suffix serves any purpose and is just confusing to the end-user.
If you think that it is important that apps/users know that a control is emulated, then I would propose adding a
V4L2_CTRL_FLAG_EMULATEDand setting it in libv4lcontrol. Similar to theFMT_FLAG_EMULATED.
I agree that if we want to differentiate for programmatic purposes (which is what Sakari seems to be talking about) it would be better do so with a flag. But lets wait till we get a real use case for that before implementing the flag.
In the mean time I think syncing up the strings with the kernel is a good idea.
Quoted 4 lines
The emulated control names and control flags were different from what the kernel uses. Sync them up.
Signed-off-by Hans Verkuil <[email protected]>
Looks good, feel free to push:
Reviewed by: Hans de Goede <[email protected]>
Regards,
Hans
Quoted 72 lines
--- lib/libv4lconvert/control/libv4lcontrol.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)lib/libv4lconvert/control/libv4lcontrol.c +8
-8@@ -788,7 +788,7 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { { .id = V4L2_CID_AUTO_WHITE_BALANCE, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Whitebalance (software)", + .name = "White Balance, Automatic", .minimum = 0, .maximum = 1, .step = 1,@@ -797,7 +797,7 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CID_HFLIP, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Horizontal flip (sw)", + .name = "Horizontal Flip", .minimum = 0, .maximum = 1, .step = 1,@@ -806,7 +806,7 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CID_VFLIP, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Vertical flip (sw)", + .name = "Vertical Flip", .minimum = 0, .maximum = 1, .step = 1,@@ -815,17 +815,17 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CID_GAMMA, .type = V4L2_CTRL_TYPE_INTEGER, - .name = "Gamma (software)", + .name = "Gamma", .minimum = 500, /* == 0.5 */ .maximum = 3000, /* == 3.0 */ .step = 1, .default_value = 1000, /* == 1.0 */ - .flags = 0 + .flags = V4L2_CTRL_FLAG_SLIDER }, { /* Dummy place holder for V4LCONTROL_AUTO_ENABLE_COUNT */ }, { .id = V4L2_CID_AUTOGAIN, .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "Auto Gain (software)", + .name = "Gain, Automatic", .minimum = 0, .maximum = 1, .step = 1,@@ -834,12 +834,12 @@ static const struct v4l2_queryctrl fake_controls[V4LCONTROL_COUNT] = { }, { .id = V4L2_CTRL_CLASS_USER + 0x2000, /* FIXME */ .type = V4L2_CTRL_TYPE_INTEGER, - .name = "Auto Gain target", + .name = "Auto Gain Target", .minimum = 0, .maximum = 255, .step = 1, .default_value = 100, - .flags =0 + .flags =V4L2_CTRL_FLAG_SLIDER }, };