Skip to contentSkip to conversation

Support V4L2_CTRL_TYPE_RECT and V4L2_CTRL_WHICH_MIN/MAX_VAL

PATCH In review Yunke Cao 2 participants 5 messages Aug 17, 2023 – Oct 10, 2023 Media (V4L/DVB)

lore
Share & tools
lore

Yunke Cao

author
#0 lore raw

cover Support V4L2_CTRL_TYPE_RECT and V4L2_CTRL_WHICH_MIN/MAX_VAL

Hi!

This patchset adds basic support for V4L2_CTRL_TYPE_RECT and V4L2_CTRL_WHICH_MIN/MAX_VAL in v4l2-ctl and v4l2-compliance.

The corresponding linux kernel patchset can be found at
https://lore.kernel.org/linux-media/[email protected]/

Yunke Cao (2):
v4l2-ctl: Support V4L2_CTRL_TYPE_RECT
v4l2-utils: Support V4L2_CTRL_WHICH_MIN/MAX_VAL

 include/linux/videodev2.h                    |  5 ++++
 utils/common/v4l2-info.cpp                   |  1 +
 utils/v4l2-compliance/v4l2-test-controls.cpp | 29 ++++++++++++++++++++
 utils/v4l2-ctl/v4l2-ctl-common.cpp           | 15 ++++++++++
 4 files changed, 50 insertions(+)
Signature · 1 line
2.41.0.694.ge786442a9b-goog
author
#1 lore raw

PATCH 1/2 v4l2-ctl: Support V4L2_CTRL_TYPE_RECT

Tested with VIVID

./v4l2-ctl -C rect -d 0
rect: 300x400@200x100

./v4l2-ctl -c rect=1000x2000@0x0
./v4l2-ctl -C rect -d 0
rect: 1000x2000@0x0

---
 include/linux/videodev2.h          |  2 ++
 utils/v4l2-ctl/v4l2-ctl-common.cpp | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
include/linux/videodev2.h +2 -0
index c19441a1..a27ea755 100644
@@ -1776,6 +1776,7 @@ struct v4l2_ext_control {
 		struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params;
 		struct v4l2_ctrl_hevc_scaling_matrix *p_hevc_scaling_matrix;
 		struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params;
+		struct v4l2_rect *p_rect;
 		void *ptr;
 	};
 } __attribute__ ((packed));
@@ -1818,6 +1819,7 @@ enum v4l2_ctrl_type {
 	V4L2_CTRL_TYPE_U16	     = 0x0101,
 	V4L2_CTRL_TYPE_U32	     = 0x0102,
 	V4L2_CTRL_TYPE_AREA          = 0x0106,
+	V4L2_CTRL_TYPE_RECT	     = 0x0107,
 
 	V4L2_CTRL_TYPE_HDR10_CLL_INFO		= 0x0110,
 	V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY	= 0x0111,
utils/v4l2-ctl/v4l2-ctl-common.cpp +15 -0
index a1cc93c8..07d2e34b 100644
@@ -516,6 +516,13 @@ static void print_value(int fd, const v4l2_query_ext_ctrl &qc, const v4l2_ext_co
 		case V4L2_CTRL_TYPE_AREA:
 			printf("%dx%d", ctrl.p_area->width, ctrl.p_area->height);
 			break;
+		case V4L2_CTRL_TYPE_RECT:
+			printf("%ux%u@%dx%d",
+			       ctrl.p_rect->width,
+			       ctrl.p_rect->height,
+			       ctrl.p_rect->left,
+			       ctrl.p_rect->top);
+			break;
 		default:
 			printf("unsupported payload type");
 			break;
@@ -604,6 +611,9 @@ static void print_qctrl(int fd, const v4l2_query_ext_ctrl &qc,
 	case V4L2_CTRL_TYPE_AREA:
 		printf("%31s %#8.8x (area)   :", s.c_str(), qc.id);
 		break;
+	case V4L2_CTRL_TYPE_RECT:
+		printf("%31s %#8.8x (rect)   :", s.c_str(), qc.id);
+		break;
 	case V4L2_CTRL_TYPE_HDR10_CLL_INFO:
 		printf("%31s %#8.8x (hdr10-cll-info):", s.c_str(), qc.id);
 		break;
@@ -1157,6 +1167,11 @@ void common_set(cv4l_fd &_fd)
 					sscanf(set_ctrl.second.c_str(), "%ux%u",
 					       &ctrl.p_area->width, &ctrl.p_area->height);
 					break;
+				case V4L2_CTRL_TYPE_RECT:
+					sscanf(set_ctrl.second.c_str(), "%ux%u@%dx%d",
+					       &ctrl.p_rect->width, &ctrl.p_rect->height,
+					       &ctrl.p_rect->left, &ctrl.p_rect->top);
+					break;
 				default:
 					fprintf(stderr, "%s: unsupported payload type\n",
 							qc.name);
Signature · 1 line
2.41.0.694.ge786442a9b-goog
#2 lore raw

Re: [PATCH 1/2] v4l2-ctl: Support V4L2_CTRL_TYPE_RECT

Quoted 28 lines · Yunke Cao

Tested with VIVID

./v4l2-ctl -C rect -d 0
rect: 300x400@200x100

./v4l2-ctl -c rect=1000x2000@0x0
./v4l2-ctl -C rect -d 0
rect: 1000x2000@0x0

---
 include/linux/videodev2.h          |  2 ++
 utils/v4l2-ctl/v4l2-ctl-common.cpp | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
include/linux/videodev2.h +1 -0
index c19441a1..a27ea755 100644
@@ -1776,6 +1776,7 @@ struct v4l2_ext_control {
 		struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params;
 		struct v4l2_ctrl_hevc_scaling_matrix *p_hevc_scaling_matrix;
 		struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params;
+		struct v4l2_rect *p_rect;
 		void *ptr;
 	};
 } __attribute__ ((packed));

include/linux/videodev2.h enum v4l2_ctrl_type { · line 1825

Quoted 7 lines
include/linux/videodev2.h +1 -0
@@ -1818,6 +1819,7 @@ enum v4l2_ctrl_type {
 	V4L2_CTRL_TYPE_U16	     = 0x0101,
 	V4L2_CTRL_TYPE_U32	     = 0x0102,
 	V4L2_CTRL_TYPE_AREA          = 0x0106,
+	V4L2_CTRL_TYPE_RECT	     = 0x0107,
 
 	V4L2_CTRL_TYPE_HDR10_CLL_INFO		= 0x0110,
 	V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY	= 0x0111,

Keep this as a separate patch. This won't be merged, instead we periodically sync the public headers in v4l-utils from the latest kernel.

Quoted 5 lines
utils/v4l2-ctl/v4l2-ctl-common.cpp +0 -0
index a1cc93c8..07d2e34b 100644

utils/v4l2-ctl/v4l2-ctl-common.cpp static void print_value(int fd, const v4l2_query_ext_ctrl &qc, const v4l2_ext_co · line 524

Quoted 9 lines
utils/v4l2-ctl/v4l2-ctl-common.cpp +6 -0
@@ -516,6 +516,13 @@ static void print_value(int fd, const v4l2_query_ext_ctrl &qc, const v4l2_ext_co
 		case V4L2_CTRL_TYPE_AREA:
 			printf("%dx%d", ctrl.p_area->width, ctrl.p_area->height);
 			break;
+		case V4L2_CTRL_TYPE_RECT:
+			printf("%ux%u@%dx%d",
+			       ctrl.p_rect->width,
+			       ctrl.p_rect->height,
+			       ctrl.p_rect->left,
+			       ctrl.p_rect->top);

Just keep this on one or two lines.

Quoted 16 lines
utils/v4l2-ctl/v4l2-ctl-common.cpp +4 -0
+			break;
 		default:
 			printf("unsupported payload type");
 			break;
@@ -604,6 +611,9 @@ static void print_qctrl(int fd, const v4l2_query_ext_ctrl &qc,
 	case V4L2_CTRL_TYPE_AREA:
 		printf("%31s %#8.8x (area)   :", s.c_str(), qc.id);
 		break;
+	case V4L2_CTRL_TYPE_RECT:
+		printf("%31s %#8.8x (rect)   :", s.c_str(), qc.id);
+		break;
 	case V4L2_CTRL_TYPE_HDR10_CLL_INFO:
 		printf("%31s %#8.8x (hdr10-cll-info):", s.c_str(), qc.id);
 		break;
@@ -1157,6 +1167,11 @@ void common_set(cv4l_fd &_fd)
 					sscanf(set_ctrl.second.c_str(), "%ux%u",

utils/v4l2-ctl/v4l2-ctl-common.cpp void common_set(cv4l_fd &_fd) · line 1177

Quoted 10 lines
utils/v4l2-ctl/v4l2-ctl-common.cpp +5 -0
 					       &ctrl.p_area->width, &ctrl.p_area->height);
 					break;
+				case V4L2_CTRL_TYPE_RECT:
+					sscanf(set_ctrl.second.c_str(), "%ux%u@%dx%d",
+					       &ctrl.p_rect->width, &ctrl.p_rect->height,
+					       &ctrl.p_rect->left, &ctrl.p_rect->top);
+					break;
 				default:
 					fprintf(stderr, "%s: unsupported payload type\n",
 							qc.name);

Looks good otherwise.

Regards,

Hans

author
#3 lore raw

PATCH 2/2 v4l2-utils: Support V4L2_CTRL_WHICH_MIN/MAX_VAL

In reply to Yunke Cao

Add string name for V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX.

Test that V4L2_CTRL_WHICH_MIN/MAX_VAL behaves as expected.
1. Calling G_EXT_CTRLS successes when V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX is set and returns -ENVALID if the flag is not set.
2. S_EXT_CTRLS and TRY_EXT_CTRLS always return fail.

Tested with VIVID:

./v4l2-ctl -l -d 0
...

		     area 0x0098f90b (area)   : value=1000x2000 flags=has-payload
read_only_integer_32_bits 0x0098f90c (int)    : min=0 max=255 step=1 default=0 value=0 flags=read-only, has-min-max
        u32_dynamic_array 0x0098f90d (u32)    : min=10 max=90 step=1 default=50 elems=1 dims=[100] flags=has-payload, dynamic-array
	   u8_pixel_array 0x0098f90e (u8)     : min=0 max=255 step=1 default=128 dims=[640][368] flags=has-payload
      s32_2_element_array 0x0098f90f (int)    : min=-10 max=10 step=1 default=2 dims=[2] flags=has-payload, has-min-max
      s64_5_element_array 0x0098f910 (int64)  : min=-10 max=10 step=1 default=4 dims=[5] flags=has-payload, has-min-max
		     rect 0x0098f911 (rect)   : value=300x400@200x100 flags=has-payload, has-min-max

...
./v4l2-compliance -d 0
...
Total for vivid device /dev/video0: 113, Succeeded: 113, Failed: 0, Warnings: 0

---
 include/linux/videodev2.h                    |  3 ++
 utils/common/v4l2-info.cpp                   |  1 +
 utils/v4l2-compliance/v4l2-test-controls.cpp | 29 ++++++++++++++++++++
 3 files changed, 33 insertions(+)
include/linux/videodev2.h +3 -0
index a27ea755..28a54e18 100644
@@ -1801,6 +1801,8 @@ struct v4l2_ext_controls {
 #define V4L2_CTRL_WHICH_CUR_VAL   0
 #define V4L2_CTRL_WHICH_DEF_VAL   0x0f000000
 #define V4L2_CTRL_WHICH_REQUEST_VAL 0x0f010000
+#define V4L2_CTRL_WHICH_MIN_VAL   0x0f020000
+#define V4L2_CTRL_WHICH_MAX_VAL   0x0f030000
 
 enum v4l2_ctrl_type {
 	V4L2_CTRL_TYPE_INTEGER	     = 1,
@@ -1903,6 +1905,7 @@ struct v4l2_querymenu {
 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE	0x0200
 #define V4L2_CTRL_FLAG_MODIFY_LAYOUT	0x0400
 #define V4L2_CTRL_FLAG_DYNAMIC_ARRAY	0x0800
+#define V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX 0x1000
 
 /*  Query flags, to be ORed with the control ID */
 #define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
utils/common/v4l2-info.cpp +1 -0
index 4f8c2aa7..b8785245 100644
@@ -530,6 +530,7 @@ std::string ctrlflags2s(__u32 flags)
 		{ V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, "execute-on-write" },
 		{ V4L2_CTRL_FLAG_MODIFY_LAYOUT, "modify-layout" },
 		{ V4L2_CTRL_FLAG_DYNAMIC_ARRAY, "dynamic-array" },
+		{ V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX, "has-min-max" },
 		{ 0, nullptr }
 	};
 	return flags2s(flags, def);
utils/v4l2-compliance/v4l2-test-controls.cpp +29 -0
index d7f6be43..e07269e6 100644
@@ -973,6 +973,26 @@ int testExtendedControls(struct node *node)
 		if (is_vivid && ctrl.id == VIVID_CID_U32_DYN_ARRAY &&
 		    checkVividDynArray(node, ctrl, qctrl))
 			return fail("dynamic array tests failed\n");
+
+		ctrls.which = V4L2_CTRL_WHICH_MIN_VAL;
+		ret = doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls);
+		if (qctrl.flags & V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX) {
+			if (ret)
+				return fail("g_ext_ctrls return an error when using WHICH_MIN (%d)\n", ret);
+		} else {
+			if (ret != EINVAL && ret != EACCES)
+				return fail("did not check against HAS_WHICH_MIN_MAX\n");
+		}
+		ctrls.which = V4L2_CTRL_WHICH_MAX_VAL;
+		ret = doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls);
+		if (qctrl.flags & V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX) {
+			if (ret)
+				return fail("g_ext_ctrls return an error when using WHICH_MAX (%d)\n", ret);
+		} else {
+			if (ret != EINVAL && ret != EACCES)
+				return fail("did not check against HAS_WHICH_MIN_MAX\n");
+		}
+
 		if (qctrl.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD)
 			delete [] ctrl.string;
 		ctrl.string = nullptr;
@@ -1084,6 +1104,15 @@ int testExtendedControls(struct node *node)
 	fail_on_test(!doioctl(node, VIDIOC_S_EXT_CTRLS, &ctrls));
 	fail_on_test(!doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls));
 	fail_on_test(doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls));
+
+	ctrls.which = V4L2_CTRL_WHICH_MIN_VAL;
+	fail_on_test(!doioctl(node, VIDIOC_S_EXT_CTRLS, &ctrls));
+	fail_on_test(!doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls));
+
+	ctrls.which = V4L2_CTRL_WHICH_MAX_VAL;
+	fail_on_test(!doioctl(node, VIDIOC_S_EXT_CTRLS, &ctrls));
+	fail_on_test(!doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls));
+
 	return 0;
 }
 
Signature · 1 line
2.41.0.694.ge786442a9b-goog
#4 lore raw

Re: [PATCH 2/2] v4l2-utils: Support V4L2_CTRL_WHICH_MIN/MAX_VAL

Quoted 44 lines · Yunke Cao

Add string name for V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX.

Test that V4L2_CTRL_WHICH_MIN/MAX_VAL behaves as expected.
1. Calling G_EXT_CTRLS successes when V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX is set and returns -ENVALID if the flag is not set.
2. S_EXT_CTRLS and TRY_EXT_CTRLS always return fail.

Tested with VIVID:

./v4l2-ctl -l -d 0
...

		     area 0x0098f90b (area)   : value=1000x2000 flags=has-payload
read_only_integer_32_bits 0x0098f90c (int)    : min=0 max=255 step=1 default=0 value=0 flags=read-only, has-min-max
        u32_dynamic_array 0x0098f90d (u32)    : min=10 max=90 step=1 default=50 elems=1 dims=[100] flags=has-payload, dynamic-array
	   u8_pixel_array 0x0098f90e (u8)     : min=0 max=255 step=1 default=128 dims=[640][368] flags=has-payload
      s32_2_element_array 0x0098f90f (int)    : min=-10 max=10 step=1 default=2 dims=[2] flags=has-payload, has-min-max
      s64_5_element_array 0x0098f910 (int64)  : min=-10 max=10 step=1 default=4 dims=[5] flags=has-payload, has-min-max
		     rect 0x0098f911 (rect)   : value=300x400@200x100 flags=has-payload, has-min-max

...
./v4l2-compliance -d 0
...
Total for vivid device /dev/video0: 113, Succeeded: 113, Failed: 0, Warnings: 0

---
 include/linux/videodev2.h                    |  3 ++
 utils/common/v4l2-info.cpp                   |  1 +
 utils/v4l2-compliance/v4l2-test-controls.cpp | 29 ++++++++++++++++++++
 3 files changed, 33 insertions(+)
include/linux/videodev2.h +2 -0
index a27ea755..28a54e18 100644
@@ -1801,6 +1801,8 @@ struct v4l2_ext_controls {
 #define V4L2_CTRL_WHICH_CUR_VAL   0
 #define V4L2_CTRL_WHICH_DEF_VAL   0x0f000000
 #define V4L2_CTRL_WHICH_REQUEST_VAL 0x0f010000
+#define V4L2_CTRL_WHICH_MIN_VAL   0x0f020000
+#define V4L2_CTRL_WHICH_MAX_VAL   0x0f030000
 
 enum v4l2_ctrl_type {
 	V4L2_CTRL_TYPE_INTEGER	     = 1,

include/linux/videodev2.h struct v4l2_querymenu { · line 1911

Quoted 7 lines
include/linux/videodev2.h +1 -0
@@ -1903,6 +1905,7 @@ struct v4l2_querymenu {
 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE	0x0200
 #define V4L2_CTRL_FLAG_MODIFY_LAYOUT	0x0400
 #define V4L2_CTRL_FLAG_DYNAMIC_ARRAY	0x0800
+#define V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX 0x1000
 
 /*  Query flags, to be ORed with the control ID */
 #define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000

Same as with the previous patch: just keep all the videodev2.h changes in a single patch at the start of the series.

Quoted 17 lines
utils/common/v4l2-info.cpp +1 -0
index 4f8c2aa7..b8785245 100644
@@ -530,6 +530,7 @@ std::string ctrlflags2s(__u32 flags)
 		{ V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, "execute-on-write" },
 		{ V4L2_CTRL_FLAG_MODIFY_LAYOUT, "modify-layout" },
 		{ V4L2_CTRL_FLAG_DYNAMIC_ARRAY, "dynamic-array" },
+		{ V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX, "has-min-max" },
 		{ 0, nullptr }
 	};
 	return flags2s(flags, def);
utils/v4l2-compliance/v4l2-test-controls.cpp +0 -0
index d7f6be43..e07269e6 100644

utils/v4l2-compliance/v4l2-test-controls.cpp int testExtendedControls(struct node *node) · line 981

Quoted 9 lines
utils/v4l2-compliance/v4l2-test-controls.cpp +6 -0
@@ -973,6 +973,26 @@ int testExtendedControls(struct node *node)
 		if (is_vivid && ctrl.id == VIVID_CID_U32_DYN_ARRAY &&
 		    checkVividDynArray(node, ctrl, qctrl))
 			return fail("dynamic array tests failed\n");
+
+		ctrls.which = V4L2_CTRL_WHICH_MIN_VAL;
+		ret = doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls);
+		if (qctrl.flags & V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX) {
+			if (ret)
+				return fail("g_ext_ctrls return an error when using WHICH_MIN (%d)\n", ret);

Just use fail_on_test_val();

utils/v4l2-compliance/v4l2-test-controls.cpp int testExtendedControls(struct node *node) · line 984

Quoted 3 lines
utils/v4l2-compliance/v4l2-test-controls.cpp +3 -0
+		} else {
+			if (ret != EINVAL && ret != EACCES)
+				return fail("did not check against HAS_WHICH_MIN_MAX\n");

Ditto.

But can EACCES be returned here? I don't think that can ever happen.

utils/v4l2-compliance/v4l2-test-controls.cpp int testExtendedControls(struct node *node) · line 994

Quoted 10 lines
utils/v4l2-compliance/v4l2-test-controls.cpp +10 -0
+		}
+		ctrls.which = V4L2_CTRL_WHICH_MAX_VAL;
+		ret = doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls);
+		if (qctrl.flags & V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX) {
+			if (ret)
+				return fail("g_ext_ctrls return an error when using WHICH_MAX (%d)\n", ret);
+		} else {
+			if (ret != EINVAL && ret != EACCES)
+				return fail("did not check against HAS_WHICH_MIN_MAX\n");
+		}

Same comments as above.

Quoted 10 lines
utils/v4l2-compliance/v4l2-test-controls.cpp +3 -0
+
 		if (qctrl.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD)
 			delete [] ctrl.string;
 		ctrl.string = nullptr;
@@ -1084,6 +1104,15 @@ int testExtendedControls(struct node *node)
 	fail_on_test(!doioctl(node, VIDIOC_S_EXT_CTRLS, &ctrls));
 	fail_on_test(!doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls));
 	fail_on_test(doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls));
+
+	ctrls.which = V4L2_CTRL_WHICH_MIN_VAL;

utils/v4l2-compliance/v4l2-test-controls.cpp int testExtendedControls(struct node *node) · line 1118

Quoted 10 lines
utils/v4l2-compliance/v4l2-test-controls.cpp +7 -0
+	fail_on_test(!doioctl(node, VIDIOC_S_EXT_CTRLS, &ctrls));
+	fail_on_test(!doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls));
+
+	ctrls.which = V4L2_CTRL_WHICH_MAX_VAL;
+	fail_on_test(!doioctl(node, VIDIOC_S_EXT_CTRLS, &ctrls));
+	fail_on_test(!doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls));
+
 	return 0;
 }
 

Regards,

Hans