media: Implement UVC v1.5 ROI
Subsystems (8)
v5 cover media: Implement UVC v1.5 ROI
This patch set implements UVC v1.5 region of interest using V4L2 control API.
ROI control is consisted two uvc specific controls.
1. A rectangle control with a newly added type V4L2_CTRL_TYPE_RECT.
2. An auto control with type bitmask.
V4L2_CTRL_WHICH_MIN/MAX_VAL is added to support the rectangle control.
Tested on two different usb cameras using v4l2-ctl and calling ioctls.
Changelog since v4:
-Cherry-pick the original patch
"v4l2-ctrls: add support for V4L2_CTRL_WHICH_MIN/MAX_VAL".
-Split patch "media: uvcvideo: implement UVC v1.5 ROI" into two patches.
The codes for supporting min/max in uvc are in patch 4/5 now.
-Minor fixes. Detailed changelog in patches
Changelog since v3:
- Reordered/sliced the patches.
1. Add rect type.
2. Add min/max.
3. Add the roi controls (including init to default).
4. Document the roi controls.
- Define the roi controls as uvc-specific in uvcvideo.h.
- Modified documentation.
- Removed the vivid change. Given the controls are now uvc-specific. I'm not sure how valuable it is to add it in vivid. Let me know otherwise.
*** BLURB HERE ***
Hans Verkuil (1):
v4l2-ctrls: add support for V4L2_CTRL_WHICH_MIN/MAX_VAL
Yunke Cao (4):
media: v4l2_ctrl: Add V4L2_CTRL_TYPE_RECT
media: uvcvideo: implement UVC v1.5 ROI
media: uvcvideo: support V4L2_CTRL_WHICH_MIN/MAX_VAL
media: uvcvideo: document UVC v1.5 ROI
.../userspace-api/media/drivers/uvcvideo.rst | 61 +++++ .../media/v4l/vidioc-g-ext-ctrls.rst | 11 +- .../media/videodev2.h.rst.exceptions | 3 + drivers/media/i2c/imx214.c | 5 +- .../media/platform/qcom/venus/venc_ctrls.c | 4 + drivers/media/usb/uvc/uvc_ctrl.c | 217 ++++++++++++++++-- drivers/media/usb/uvc/uvc_v4l2.c | 12 +- drivers/media/usb/uvc/uvcvideo.h | 10 +- drivers/media/v4l2-core/v4l2-ctrls-api.c | 51 +++- drivers/media/v4l2-core/v4l2-ctrls-core.c | 155 ++++++++++++- drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- include/media/v4l2-ctrls.h | 34 ++- include/uapi/linux/usb/video.h | 1 + include/uapi/linux/uvcvideo.h | 13 ++ include/uapi/linux/v4l2-controls.h | 8 + include/uapi/linux/videodev2.h | 4 + 16 files changed, 540 insertions(+), 53 deletions(-)
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
PATCH v5 1/5 media: v4l2_ctrl: Add V4L2_CTRL_TYPE_RECT
Add p_rect to struct v4l2_ext_control with basic support in v4l2-ctrls.
---
Changelog since v4:
- Fix typo.
.../media/v4l/vidioc-g-ext-ctrls.rst | 4 ++++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-ctrls-core.c | 20 +++++++++++++++++++ include/media/v4l2-ctrls.h | 2 ++ include/uapi/linux/videodev2.h | 2 ++ 5 files changed, 29 insertions(+)
Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +4 -0
@@ -189,6 +189,10 @@ still cause this situation. - ``p_area`` - A pointer to a struct :c:type:`v4l2_area`. Valid if this control is of type ``V4L2_CTRL_TYPE_AREA``. + * - struct :c:type:`v4l2_rect` * + - ``p_rect`` + - A pointer to a struct :c:type:`v4l2_rect`. Valid if this control is + of type ``V4L2_CTRL_TYPE_RECT``. * - struct :c:type:`v4l2_ctrl_h264_sps` * - ``p_h264_sps`` - A pointer to a struct :c:type:`v4l2_ctrl_h264_sps`. Valid if this control is
Documentation/userspace-api/media/videodev2.h.rst.exceptions +1 -0
@@ -147,6 +147,7 @@ replace symbol V4L2_CTRL_TYPE_HEVC_SPS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_HEVC_PPS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_AREA :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_RECT :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_FWHT_PARAMS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_VP8_FRAME :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR :c:type:`v4l2_ctrl_type`
drivers/media/v4l2-core/v4l2-ctrls-core.c +20 -0
@@ -84,6 +84,11 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx,return ptr1.p_u16[idx] == ptr2.p_u16[idx];case V4L2_CTRL_TYPE_U32 :return ptr1.p_u32[idx] == ptr2.p_u32[idx]; +case V4L2_CTRL_TYPE_RECT : +return ptr1.p_rect->top == ptr2.p_rect->top && + ptr1.p_rect->left == ptr2.p_rect->left && + ptr1.p_rect->height == ptr2.p_rect->height && + ptr1.p_rect->width == ptr2.p_rect->width;default :if (ctrl->is_int)return ptr1.p_s32[idx] == ptr2.p_s32[idx];
@@ -307,6 +312,11 @@ static void std_log(const struct v4l2_ctrl *ctrl)case V4L2_CTRL_TYPE_VP9_FRAME :pr_cont ("VP9_FRAME" );break ; +case V4L2_CTRL_TYPE_RECT : +pr_cont ("%ux%u@%dx%d" , + ptr.p_rect->width, ptr.p_rect->height, + ptr.p_rect->left, ptr.p_rect->top); +break ;default :pr_cont ("unknown type %d" , ctrl->type);break ;
@@ -525,6 +535,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,struct v4l2_ctrl_hdr10_mastering_display *p_hdr10_mastering;struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params;struct v4l2_area *area; +struct v4l2_rect *rect;void *p = ptr.p + idx * ctrl->elem_size;unsigned int i;
@@ -888,6 +899,12 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,return -EINVAL ;break ; +case V4L2_CTRL_TYPE_RECT : + rect = p; +if (!rect->width || !rect->height) +return -EINVAL ; +break ; +default :return -EINVAL ; }
@@ -1456,6 +1473,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,case V4L2_CTRL_TYPE_AREA : elem_size =sizeof (struct v4l2_area );break ; +case V4L2_CTRL_TYPE_RECT : + elem_size =sizeof (struct v4l2_rect ); +break ;default :if (type <V4L2_CTRL_COMPOUND_TYPES ) elem_size =sizeof (s32);
include/media/v4l2-ctrls.h +2 -0
@@ -58,6 +58,7 @@ struct video_device;* @p_hdr10_cll: Pointer to an HDR10 Content Light Level structure. * @p_hdr10_mastering: Pointer to an HDR10 Mastering Display structure. * @p_area: Pointer to an area. +* @p_rect: Pointer to a rectangle. * @p: Pointer to a compound value. * @p_const: Pointer to a constant compound value. */
@@ -87,6 +88,7 @@ union v4l2_ctrl_ptr {struct v4l2_ctrl_hdr10_cll_info *p_hdr10_cll;struct v4l2_ctrl_hdr10_mastering_display *p_hdr10_mastering;struct v4l2_area *p_area; +struct v4l2_rect *p_rect;void *p;const void *p_const; };
include/uapi/linux/videodev2.h +2 -0
@@ -1751,6 +1751,7 @@ struct v4l2_ext_control {__u16 __user *p_u16;__u32 __user *p_u32;struct v4l2_area __user *p_area; +struct v4l2_rect __user *p_rect;struct v4l2_ctrl_h264_sps __user *p_h264_sps;struct v4l2_ctrl_h264_pps *p_h264_pps;struct v4l2_ctrl_h264_scaling_matrix __user *p_h264_scaling_matrix;
@@ -1810,6 +1811,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,
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
Re: [PATCH v5 1/5] media: v4l2_ctrl: Add V4L2_CTRL_TYPE_RECT
Quoted 5 lines · Yunke Cao
Add
p_rectto structv4l2_ext_controlwith basic support in v4l2-ctrls.Signed-off-by Yunke Cao <[email protected]>
Quoted 139 lines
---
Changelog since v4:
- Fix typo..../media/v4l/vidioc-g-ext-ctrls.rst | 4 ++++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-ctrls-core.c | 20 +++++++++++++++++++ include/media/v4l2-ctrls.h | 2 ++ include/uapi/linux/videodev2.h | 2 ++ 5 files changed, 29 insertions(+)Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +4
-0@@ -189,6 +189,10 @@ still cause this situation. - ``p_area`` - A pointer to a struct :c:type:`v4l2_area`. Valid if this control is of type ``V4L2_CTRL_TYPE_AREA``. + * - struct :c:type:`v4l2_rect` * + - ``p_rect`` + - A pointer to a struct :c:type:`v4l2_rect`. Valid if this control is + of type ``V4L2_CTRL_TYPE_RECT``. * - struct :c:type:`v4l2_ctrl_h264_sps` * - ``p_h264_sps`` - A pointer to a struct :c:type:`v4l2_ctrl_h264_sps`. Valid if this control isDocumentation/userspace-api/media/videodev2.h.rst.exceptions +1
-0@@ -147,6 +147,7 @@ replace symbol V4L2_CTRL_TYPE_HEVC_SPS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_HEVC_PPS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_AREA :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_RECT :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_FWHT_PARAMS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_VP8_FRAME :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR :c:type:`v4l2_ctrl_type`drivers/media/v4l2-core/v4l2-ctrls-core.c +20
-0@@ -84,6 +84,11 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx,return ptr1.p_u16[idx] == ptr2.p_u16[idx];case V4L2_CTRL_TYPE_U32 :return ptr1.p_u32[idx] == ptr2.p_u32[idx]; +case V4L2_CTRL_TYPE_RECT : +return ptr1.p_rect->top == ptr2.p_rect->top && + ptr1.p_rect->left == ptr2.p_rect->left && + ptr1.p_rect->height == ptr2.p_rect->height && + ptr1.p_rect->width == ptr2.p_rect->width;default :if (ctrl->is_int)return ptr1.p_s32[idx] == ptr2.p_s32[idx];@@ -307,6 +312,11 @@ static void std_log(const struct v4l2_ctrl *ctrl)case V4L2_CTRL_TYPE_VP9_FRAME :pr_cont ("VP9_FRAME" );break ; +case V4L2_CTRL_TYPE_RECT : +pr_cont ("%ux%u@%dx%d" , + ptr.p_rect->width, ptr.p_rect->height, + ptr.p_rect->left, ptr.p_rect->top); +break ;default :pr_cont ("unknown type %d" , ctrl->type);break ;@@ -525,6 +535,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,struct v4l2_ctrl_hdr10_mastering_display *p_hdr10_mastering;struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params;struct v4l2_area *area; +struct v4l2_rect *rect;void *p = ptr.p + idx * ctrl->elem_size;unsigned int i;@@ -888,6 +899,12 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,return -EINVAL ;break ; +case V4L2_CTRL_TYPE_RECT : + rect = p; +if (!rect->width || !rect->height) +return -EINVAL ; +break ; +default :return -EINVAL ; }@@ -1456,6 +1473,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,case V4L2_CTRL_TYPE_AREA : elem_size =sizeof (struct v4l2_area );break ; +case V4L2_CTRL_TYPE_RECT : + elem_size =sizeof (struct v4l2_rect ); +break ;default :if (type <V4L2_CTRL_COMPOUND_TYPES ) elem_size =sizeof (s32);include/media/v4l2-ctrls.h +2
-0@@ -58,6 +58,7 @@ struct video_device;* @p_hdr10_cll: Pointer to an HDR10 Content Light Level structure. * @p_hdr10_mastering: Pointer to an HDR10 Mastering Display structure. * @p_area: Pointer to an area. +* @p_rect: Pointer to a rectangle. * @p: Pointer to a compound value. * @p_const: Pointer to a constant compound value. */ @@ -87,6 +88,7 @@ union v4l2_ctrl_ptr {struct v4l2_ctrl_hdr10_cll_info *p_hdr10_cll;struct v4l2_ctrl_hdr10_mastering_display *p_hdr10_mastering;struct v4l2_area *p_area; +struct v4l2_rect *p_rect;void *p;const void *p_const; };include/uapi/linux/videodev2.h +2
-1@@ -1751,6 +1751,7 @@ struct v4l2_ext_control {__u16 __user *p_u16;__u32 __user *p_u32;struct v4l2_area __user *p_area; +struct v4l2_rect __user *p_rect;struct v4l2_ctrl_h264_sps __user *p_h264_sps;struct v4l2_ctrl_h264_pps *p_h264_pps;struct v4l2_ctrl_h264_scaling_matrix __user *p_h264_scaling_matrix;@@ -1810,6 +1811,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, --2.36.1.124.g0e6072fb45-goog
Signature · 1 line
Ricardo Ribalda
Re: [PATCH v5 1/5] media: v4l2_ctrl: Add V4L2_CTRL_TYPE_RECT
In reply to Yunke Caodrivers/media/v4l2-core/v4l2-ctrls-core.c static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, · line 906
Quoted 9 lines · Yunke Cao
drivers/media/v4l2-core/v4l2-ctrls-core.c +5
-0@@ -888,6 +899,12 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,return -EINVAL ;break ; +case V4L2_CTRL_TYPE_RECT : + rect = p; +if (!rect->width || !rect->height) +return -EINVAL ; +break ;
Should we allow (0,0,0,0) rectangles or not? From UVC point of view, I assume that anything that is within GET_MIN/GET_MAX is OK. Is GET_MIN always guaranteed to be at least (0,0,1,1) or do some firmwares permit and use (0,0,0,0)? As a "disable ROI" type of thing, for instance.
PATCH v5 2/5 v4l2-ctrls: add support for V4L2_CTRL_WHICH_MIN/MAX_VAL
In reply to Yunke CaoFrom: Hans Verkuil <[email protected]>
Add the capability of retrieving the min and max values of a compound control.
---
git am from https://lore.kernel.org/all/[email protected]/
-Fixed some merge conflits.
-Fixed the build error in drivers/media/platform/qcom/venus.
.../media/v4l/vidioc-g-ext-ctrls.rst | 7 +- .../media/videodev2.h.rst.exceptions | 2 + drivers/media/i2c/imx214.c | 5 +- .../media/platform/qcom/venus/venc_ctrls.c | 4 + drivers/media/v4l2-core/v4l2-ctrls-api.c | 51 +++++-- drivers/media/v4l2-core/v4l2-ctrls-core.c | 135 ++++++++++++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- include/media/v4l2-ctrls.h | 32 ++++- include/uapi/linux/videodev2.h | 2 + 9 files changed, 214 insertions(+), 28 deletions(-)
Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +5 -2
@@ -284,14 +284,17 @@ still cause this situation. - Which value of the control to get/set/try. * - :cspan:`2` ``V4L2_CTRL_WHICH_CUR_VAL`` will return the current value of the control, ``V4L2_CTRL_WHICH_DEF_VAL`` will return the default + value of the control, ``V4L2_CTRL_WHICH_MIN_VAL`` will return the minimum + value of the control, ``V4L2_CTRL_WHICH_MAX_VAL`` will return the maximum value of the control and ``V4L2_CTRL_WHICH_REQUEST_VAL`` indicates that these controls have to be retrieved from a request or tried/set for a request. In the latter case the ``request_fd`` field contains the file descriptor of the request that should be used. If the device does not support requests, then ``EACCES`` will be returned. - When using ``V4L2_CTRL_WHICH_DEF_VAL`` be aware that you can only - get the default value of the control, you cannot set or try it. + When using ``V4L2_CTRL_WHICH_DEF_VAL``, ``V4L2_CTRL_WHICH_MIN_VAL`` + or ``V4L2_CTRL_WHICH_MAX_VAL`` be aware that you can only get the + default/minimum/maximum value of the control, you cannot set or try it. For backwards compatibility you can also use a control class here (see :ref:`ctrl-class`). In that case all controls have to
Documentation/userspace-api/media/videodev2.h.rst.exceptions +2 -0
@@ -553,6 +553,8 @@ ignore define V4L2_CTRL_DRIVER_PRIV ignore define V4L2_CTRL_MAX_DIMS ignore define V4L2_CTRL_WHICH_CUR_VAL ignore define V4L2_CTRL_WHICH_DEF_VAL +ignore define V4L2_CTRL_WHICH_MIN_VAL +ignore define V4L2_CTRL_WHICH_MAX_VAL ignore define V4L2_CTRL_WHICH_REQUEST_VAL ignore define V4L2_OUT_CAP_CUSTOM_TIMINGS ignore define V4L2_CID_MAX_CTRLS
drivers/media/i2c/imx214.c +4 -1
@@ -1037,7 +1037,10 @@ static int imx214_probe(struct i2c_client *client) imx214->unit_size =v4l2_ctrl_new_std_compound (&imx214->ctrls,NULL ,V4L2_CID_UNIT_CELL_SIZE , -v4l2_ctrl_ptr_create ((void *)&unit_size)); +v4l2_ctrl_ptr_create ((void *)&unit_size), +v4l2_ctrl_ptr_create (NULL ), +v4l2_ctrl_ptr_create (NULL )); + ret = imx214->ctrls.error;if (ret) { dev_err(&client->dev, "%s control init failed (%d)\n",
drivers/media/platform/qcom/venus/venc_ctrls.c +4 -0
@@ -576,10 +576,14 @@ int venc_ctrl_init(struct venus_inst *inst)v4l2_ctrl_new_std_compound (&inst->ctrl_handler, &venc_ctrl_ops,V4L2_CID_COLORIMETRY_HDR10_CLL_INFO , +v4l2_ctrl_ptr_create (NULL ), +v4l2_ctrl_ptr_create (NULL ),v4l2_ctrl_ptr_create (NULL ));v4l2_ctrl_new_std_compound (&inst->ctrl_handler, &venc_ctrl_ops,V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY , +v4l2_ctrl_ptr_create (NULL ), +v4l2_ctrl_ptr_create (NULL ),v4l2_ctrl_ptr_create (NULL )); v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
drivers/media/v4l2-core/v4l2-ctrls-api.c +41 -10
101 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-ctrls-core.c +126 -9
213 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-ioctl.c +3 -1
@@ -892,7 +892,9 @@ static bool check_ext_ctrls(struct v4l2_ext_controls *c, unsigned long ioctl)return false;break ;case V4L2_CTRL_WHICH_DEF_VAL : -/* Default value cannot be changed */ +case V4L2_CTRL_WHICH_MIN_VAL : +case V4L2_CTRL_WHICH_MAX_VAL : +/* Default, minimum or maximum value cannot be changed */ if (ioctl ==VIDIOC_S_EXT_CTRLS || ioctl ==VIDIOC_TRY_EXT_CTRLS ) { c->error_idx = c->count;
include/media/v4l2-ctrls.h +27 -5
@@ -131,6 +131,8 @@ struct v4l2_ctrl_ops {* * @equal: return true if both values are equal. * @init: initialize the value. +* @minimum: set the value to the minimum value of the control. +* @maximum: set the value to the maximum value of the control. * @log: log the value. * @validate: validate the value. Return 0 on success and a negative value * otherwise.
@@ -141,6 +143,10 @@ struct v4l2_ctrl_type_ops { union v4l2_ctrl_ptr ptr2);void (*init)(const struct v4l2_ctrl *ctrl,u32 idx,union v4l2_ctrl_ptr ptr); +void (*minimum)(const struct v4l2_ctrl *ctrl,u32 idx, +union v4l2_ctrl_ptr ptr); +void (*maximum)(const struct v4l2_ctrl *ctrl,u32 idx, +union v4l2_ctrl_ptr ptr);void (*log)(const struct v4l2_ctrl *ctrl);int (*validate)(const struct v4l2_ctrl *ctrl,u32 idx,union v4l2_ctrl_ptr ptr);
@@ -237,6 +243,12 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);* @p_def: The control's default value represented via a union which * provides a standard way of accessing control types * through a pointer (for compound controls only). +* @p_min: The control's minimum value represented via a union which +* provides a standard way of accessing control types +* through a pointer (for compound controls only). +* @p_max: The control's maximum value represented via a union which +* provides a standard way of accessing control types +* through a pointer (for compound controls only). * @p_cur: The control's current value represented via a union which * provides a standard way of accessing control types * through a pointer.
@@ -292,6 +304,8 @@ struct v4l2_ctrl { } cur;union v4l2_ctrl_ptr p_def; +union v4l2_ctrl_ptr p_min; +union v4l2_ctrl_ptr p_max;union v4l2_ctrl_ptr p_new;union v4l2_ctrl_ptr p_cur; };
@@ -398,6 +412,8 @@ struct v4l2_ctrl_handler {* @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. +* @p_min: The control's minimum value for compound controls. +* @p_max: The control's maximum value for compound controls. * @dims: The size of each dimension. * @elem_size: The size in bytes of the control. * @flags: The control's flags.
@@ -427,6 +443,8 @@ struct v4l2_ctrl_config {u64 step;s64 def;union v4l2_ctrl_ptr p_def; +union v4l2_ctrl_ptr p_min; +union v4l2_ctrl_ptr p_max;u32 dims[V4L2_CTRL_MAX_DIMS ];u32 elem_size;u32 flags;
@@ -696,17 +714,21 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl,* @ops: The control ops. * @id: The control ID. * @p_def: The control's default value. +* @p_min: The control's minimum value. +* @p_max: The control's maximum value. * -* Sames as v4l2_ctrl_new_std(), but with support to compound controls, thanks -* to the @p_def field. Use v4l2_ctrl_ptr_create() to create @p_def from a -* pointer. Use v4l2_ctrl_ptr_create(NULL) if the default value of the -* compound control should be all zeroes. +* Same as v4l2_ctrl_new_std(), but with support to compound controls, thanks +* to the @p_def/min/max field. Use v4l2_ctrl_ptr_create() to create +* @p_def/min/max from a pointer. Use v4l2_ctrl_ptr_create(NULL) if the +* default/min/max value of the compound control should be all zeroes. * */ struct v4l2_ctrl *v4l2_ctrl_new_std_compound (struct v4l2_ctrl_handler *hdl,const struct v4l2_ctrl_ops *ops,u32 id, -const union v4l2_ctrl_ptr p_def); +const union v4l2_ctrl_ptr p_def, +const union v4l2_ctrl_ptr p_min, +const union v4l2_ctrl_ptr p_max);/** * v4l2_ctrl_new_int_menu() - Create a new standard V4L2 integer menu control.
include/uapi/linux/videodev2.h +2 -0
@@ -1793,6 +1793,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 0x0f030000enum v4l2_ctrl_type {V4L2_CTRL_TYPE_INTEGER =1 ,
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
PATCH v5 3/5 media: uvcvideo: implement UVC v1.5 ROI
In reply to Yunke CaoImplement support for ROI as described in UVC 1.5:
4.2.2.1.20 Digital Region of Interest (ROI) Control
ROI control is implemented using V4L2 control API as two uvc-specific controls:V4L2_CID_UVC_REGION_OF_INTEREST_RECT and V4L2_CID_UVC_REGION_OF_INTEREST_AUTO.
---
References a rejected attempt that uses v4l2 selection API:
https://lore.kernel.org/lkml/[email protected]
Changelog since v4:
-Check boundary condition: width or height == 0. -Populate xctrl->id and xctrl->size.
-Split code for V4L2_CTRL_WHICH_MIN/MAX_VAL to patch 4/5.
drivers/media/usb/uvc/uvc_ctrl.c | 207 ++++++++++++++++++++++++++--- drivers/media/usb/uvc/uvc_v4l2.c | 8 +- drivers/media/usb/uvc/uvcvideo.h | 10 +- include/uapi/linux/usb/video.h | 1 + include/uapi/linux/uvcvideo.h | 13 ++ include/uapi/linux/v4l2-controls.h | 8 ++ 6 files changed, 223 insertions(+), 24 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +190 -17
@@ -355,6 +355,16 @@ static const struct uvc_control_info uvc_ctrls[] = { .flags = UVC_CTRL_FLAG_GET_CUR | UVC_CTRL_FLAG_AUTO_UPDATE, }, + { + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .index = 21, + .size = 10, + .flags = UVC_CTRL_FLAG_SET_CUR | UVC_CTRL_FLAG_GET_CUR + | UVC_CTRL_FLAG_GET_MIN | UVC_CTRL_FLAG_GET_MAX + | UVC_CTRL_FLAG_GET_DEF + | UVC_CTRL_FLAG_AUTO_UPDATE, + }, };static const u32 uvc_control_classes[] = {
@@ -728,6 +738,24 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, }, + { + .id = V4L2_CID_UVC_REGION_OF_INTEREST_RECT, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .size = 64, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_RECT, + .data_type = UVC_CTRL_DATA_TYPE_RECT, + }, + { + .id = V4L2_CID_UVC_REGION_OF_INTEREST_AUTO, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .size = 16, + .offset = 64, + .v4l2_type = V4L2_CTRL_TYPE_BITMASK, + .data_type = UVC_CTRL_DATA_TYPE_BITMASK, + }, };/* ------------------------------------------------------------------------
@@ -749,6 +777,34 @@ static inline void uvc_clear_bit(u8 *data, int bit) data[bit >>3 ] &= ~(1 << (bit &7 )); } +static void uvc_to_v4l2_rect (struct v4l2_rect *v4l2_rect, +const struct uvc_rect *uvc_rect) +{ + v4l2_rect->top = uvc_rect->top; + v4l2_rect->left = uvc_rect->left; + v4l2_rect->height = uvc_rect->bottom - uvc_rect->top +1 ; + v4l2_rect->width = uvc_rect->right - uvc_rect->left +1 ; +} + +static int v4l2_to_uvc_rect (struct uvc_rect *uvc_rect, +const struct v4l2_rect *v4l2_rect) +{ +// Safely converts s32 and u32 to u16. +if (v4l2_rect->top >U16_MAX || v4l2_rect->top <0 || + v4l2_rect->left >U16_MAX || v4l2_rect->left <0 || + v4l2_rect->height >U16_MAX || v4l2_rect->height ==0 || + v4l2_rect->width >U16_MAX || v4l2_rect->width ==0 || + v4l2_rect->height + v4l2_rect->top -1 >U16_MAX || + v4l2_rect->width + v4l2_rect->left -1 >U16_MAX ) +return -ERANGE ; + + uvc_rect->top = v4l2_rect->top; + uvc_rect->left = v4l2_rect->left; + uvc_rect->bottom = v4l2_rect->height + v4l2_rect->top -1 ; + uvc_rect->right = v4l2_rect->width + v4l2_rect->left -1 ; +return 0 ; +} +/* Extract the bit string specified by mapping->offset and mapping->size * from the little-endian data stored at 'data' and return the result as * a signed 32bit integer. Sign extension will be performed if the mapping
@@ -963,11 +1019,23 @@ static s32 __uvc_ctrl_get_value(struct uvc_control_mapping *mapping,return value; } +static void __uvc_ctrl_get_v4l2_rect (struct uvc_control *ctrl, +struct uvc_control_mapping *mapping, +u32 id, +struct v4l2_rect *rect) +{ +struct uvc_rect *uvc_rect = + (struct uvc_rect *)(uvc_ctrl_data (ctrl, id) + + mapping->offset /8 ); +uvc_to_v4l2_rect (rect, uvc_rect); +} +static int __uvc_ctrl_get (struct uvc_video_chain *chain,struct uvc_control *ctrl,struct uvc_control_mapping *mapping, -s32 *value) +struct v4l2_ext_control *xctrl) {int ret; +struct v4l2_rect v4l2_rect = {};if ((ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR ) ==0 )return -EACCES ;
@@ -993,8 +1061,19 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, ctrl->loaded =1 ; } - *value =__uvc_ctrl_get_value (mapping, + xctrl->id = mapping->id; +switch (mapping->v4l2_type) { +case V4L2_CTRL_TYPE_RECT : +__uvc_ctrl_get_v4l2_rect (ctrl, mapping,UVC_CTRL_DATA_CURRENT , + &v4l2_rect); + xctrl->size =sizeof (v4l2_rect); +return copy_to_user (xctrl->p_rect, &v4l2_rect, +sizeof (v4l2_rect)); + +default : + xctrl->value =__uvc_ctrl_get_value (mapping,uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); + }return 0 ; }
@@ -1104,13 +1183,14 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,__uvc_find_control (ctrl->entity, mapping->master_id, &master_map, &master_ctrl,0 );if (master_ctrl && (master_ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR )) { -s32 val; -int ret =__uvc_ctrl_get (chain, master_ctrl, master_map, &val); +struct v4l2_ext_control xctrl; +int ret = +__uvc_ctrl_get (chain, master_ctrl, master_map, &xctrl);if (ret <0 )return ret; -if (val != mapping->master_manual) - v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; +if (xctrl.value != mapping->master_manual) + v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; }if (!ctrl->cached) {
@@ -1344,16 +1424,16 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain,struct uvc_control_mapping *mapping =NULL ;struct uvc_control *ctrl =NULL ;u32 changes =V4L2_EVENT_CTRL_CH_FLAGS ; -s32 val =0 ; +struct v4l2_ext_control xctrl;__uvc_find_control (master->entity, slave_id, &mapping, &ctrl,0 );if (ctrl ==NULL )return ; -if (__uvc_ctrl_get (chain, ctrl, mapping, &val) ==0 ) +if (__uvc_ctrl_get (chain, ctrl, mapping, &xctrl) ==0 ) changes |=V4L2_EVENT_CTRL_CH_VALUE ; -uvc_ctrl_send_event (chain, handle, ctrl, mapping, val, changes); +uvc_ctrl_send_event (chain, handle, ctrl, mapping, xctrl.value, changes); } void uvc_ctrl_status_event(struct uvc_video_chain *chain,
@@ -1515,13 +1595,13 @@ static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev, unsigned elems)if (sev->flags &V4L2_EVENT_SUB_FL_SEND_INITIAL ) {struct v4l2_event ev;u32 changes =V4L2_EVENT_CTRL_CH_FLAGS ; -s32 val =0 ; +struct v4l2_ext_control xctrl; -if (__uvc_ctrl_get (handle->chain, ctrl, mapping, &val) ==0 ) +if (__uvc_ctrl_get (handle->chain, ctrl, mapping, &xctrl) ==0 ) changes |=V4L2_EVENT_CTRL_CH_VALUE ; -uvc_ctrl_fill_event (handle->chain, &ev, ctrl, mapping, val, - changes); +uvc_ctrl_fill_event (handle->chain, &ev, ctrl, mapping, + xctrl.value, changes);/* Mark the queue as active, allowing this initial event to be accepted. */ sev->elems = elems;
@@ -1682,10 +1762,14 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, }int uvc_ctrl_get (struct uvc_video_chain *chain, -struct v4l2_ext_control *xctrl) +struct v4l2_ext_control *xctrl,u32 v4l2_which) {struct uvc_control *ctrl;struct uvc_control_mapping *mapping; +int ret; +u32 flag; +u32 id; +u8 query;if (__uvc_query_v4l2_class (chain, xctrl->id,0 ) >=0 )return -EACCES ;
@@ -1694,7 +1778,36 @@ int uvc_ctrl_get(struct uvc_video_chain *chain,if (ctrl ==NULL )return -EINVAL ; -return __uvc_ctrl_get (chain, ctrl, mapping, &xctrl->value); +switch (v4l2_which) { +case V4L2_CTRL_WHICH_DEF_VAL : + flag =UVC_CTRL_FLAG_GET_DEF ; + id =UVC_CTRL_DATA_DEF ; + query =UVC_GET_DEF ; +break ; +case V4L2_CTRL_WHICH_CUR_VAL : +default : +return __uvc_ctrl_get (chain, ctrl, mapping, xctrl); + } + +if (!ctrl->cached) { + ret =uvc_ctrl_populate_cache (chain, ctrl); +if (ret <0 ) +return ret; + } + +if (!(ctrl->info.flags & flag)) +return -EACCES ; + +if (mapping->v4l2_type ==V4L2_CTRL_TYPE_RECT ) { +struct v4l2_rect rect; + +__uvc_ctrl_get_v4l2_rect (ctrl, mapping, id, &rect); +return copy_to_user (xctrl->p_rect, &rect,sizeof (rect)); + } + + xctrl->value = mapping->get (mapping, query,uvc_ctrl_data (ctrl, id)); + +return 0 ; } int uvc_ctrl_set(struct uvc_fh *handle,
@@ -1703,6 +1816,8 @@ int uvc_ctrl_set(struct uvc_fh *handle,struct uvc_video_chain *chain = handle->chain;struct uvc_control *ctrl;struct uvc_control_mapping *mapping; +struct v4l2_rect v4l2_rect; +struct uvc_rect uvc_rect;s32 value;u32 step;s32 min;
@@ -1774,6 +1889,16 @@ int uvc_ctrl_set(struct uvc_fh *handle,break ; +case V4L2_CTRL_TYPE_RECT : + ret =copy_from_user (&v4l2_rect, xctrl->p_rect, +sizeof (v4l2_rect)); +if (ret <0 ) +return ret; + ret =v4l2_to_uvc_rect (&uvc_rect, &v4l2_rect); +if (ret <0 ) +return ret; +break ; +default : value = xctrl->value;break ;
@@ -1807,8 +1932,16 @@ int uvc_ctrl_set(struct uvc_fh *handle, ctrl->info.size); } - mapping->set (mapping, value, -uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); +switch (mapping->data_type) { +case UVC_CTRL_DATA_TYPE_RECT : +memcpy (uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT ) + + mapping->offset /8 , + &uvc_rect,sizeof (uvc_rect)); +break ; +default : + mapping->set (mapping, value, +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); + }if (ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) ctrl->handle = handle;
@@ -2366,6 +2499,40 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev, } } +static int uvc_ctrl_init_roi (struct uvc_device *dev,struct uvc_control *ctrl) +{ +int ret; + + ret =uvc_query_ctrl (dev,UVC_GET_DEF , ctrl->entity->id, dev->intfnum, +UVC_CT_REGION_OF_INTEREST_CONTROL , +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_DEF ), + ctrl->info.size); +if (ret) + goto out; + +/* +* Most firmwares have wrong GET_CURRENT configuration. E.g. it's +* below GET_MIN, or have rectangle coordinates mixed up. This +* causes problems sometimes, because we are unable to set +* auto-controls value without first setting ROI rectangle to +* valid configuration. +* +* We expect that default configuration is always correct and +* is within the GET_MIN / GET_MAX boundaries. +* +* Set current ROI configuration to GET_DEF, so that we will +* always have properly configured ROI. +*/ + ret =uvc_query_ctrl (dev,UVC_SET_CUR ,1 , dev->intfnum, +UVC_CT_REGION_OF_INTEREST_CONTROL , +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_DEF ), + ctrl->info.size); +out: +if (ret) +dev_err (&dev->udev->dev,"Failed to fixup ROI (%d).\n" , ret); +return ret; +} +/* * Add control information and hardcoded stock control mappings to the given * device.
@@ -2378,6 +2545,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,const struct uvc_control_mapping *mapping = uvc_ctrl_mappings;const struct uvc_control_mapping *mend = mapping +ARRAY_SIZE (uvc_ctrl_mappings); +const u8 camera_entity[16 ] =UVC_GUID_UVC_CAMERA ;/* XU controls initialization requires querying the device for control * information. As some buggy UVC devices will crash when queried
@@ -2398,6 +2566,11 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,* GET_INFO on standard controls. */ uvc_ctrl_get_flags (chain->dev, ctrl, &ctrl->info); + +if (ctrl->info.selector == +UVC_CT_REGION_OF_INTEREST_CONTROL && +uvc_entity_match_guid (ctrl->entity, camera_entity)) +uvc_ctrl_init_roi (chain->dev, ctrl);break ; } }
drivers/media/usb/uvc/uvc_v4l2.c +2 -6
@@ -1040,15 +1040,11 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,if (ctrls->which ==V4L2_CTRL_WHICH_DEF_VAL ) {for (i =0 ; i < ctrls->count; ++ctrl, ++i) { -struct v4l2_queryctrl qc = { .id = ctrl->id }; - - ret =uvc_query_v4l2_ctrl (chain, &qc); + ret =uvc_ctrl_get (chain, ctrl, ctrls->which);if (ret <0 ) { ctrls->error_idx = i;return ret; } - - ctrl->value = qc.default_value; }return 0 ;
@@ -1059,7 +1055,7 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,return ret;for (i =0 ; i < ctrls->count; ++ctrl, ++i) { - ret =uvc_ctrl_get (chain, ctrl); + ret =uvc_ctrl_get (chain, ctrl, ctrls->which);if (ret <0 ) {uvc_ctrl_rollback (handle); ctrls->error_idx = i;
drivers/media/usb/uvc/uvcvideo.h +9 -1
@@ -424,6 +424,13 @@ struct uvc_streaming_header {u8 bTriggerUsage; }; +struct uvc_rect { +u16 top; +u16 left; +u16 bottom; +u16 right; +} __packed; +enum uvc_buffer_state {UVC_BUF_STATE_IDLE =0 ,UVC_BUF_STATE_QUEUED =1 ,
@@ -897,7 +904,8 @@ static inline int uvc_ctrl_rollback(struct uvc_fh *handle)return __uvc_ctrl_commit (handle,1 ,NULL ); } -int uvc_ctrl_get (struct uvc_video_chain *chain,struct v4l2_ext_control *xctrl); +int uvc_ctrl_get (struct uvc_video_chain *chain,struct v4l2_ext_control *xctrl, +u32 v4l2_which);int uvc_ctrl_set (struct uvc_fh *handle,struct v4l2_ext_control *xctrl);int uvc_ctrl_is_accessible (struct uvc_video_chain *chain,u32 v4l2_id,bool read);
include/uapi/linux/usb/video.h +1 -0
@@ -104,6 +104,7 @@#define UVC_CT_ROLL_ABSOLUTE_CONTROL 0x0f#define UVC_CT_ROLL_RELATIVE_CONTROL 0x10#define UVC_CT_PRIVACY_CONTROL 0x11 +#define UVC_CT_REGION_OF_INTEREST_CONTROL 0x14/* A.9.5. Processing Unit Control Selectors */ #define UVC_PU_CONTROL_UNDEFINED 0x00
include/uapi/linux/uvcvideo.h +13 -0
@@ -16,6 +16,7 @@#define UVC_CTRL_DATA_TYPE_BOOLEAN 3#define UVC_CTRL_DATA_TYPE_ENUM 4#define UVC_CTRL_DATA_TYPE_BITMASK 5 +#define UVC_CTRL_DATA_TYPE_RECT 6/* Control flags */ #define UVC_CTRL_FLAG_SET_CUR (1 << 0)
@@ -36,6 +37,18 @@ UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES | \ UVC_CTRL_FLAG_GET_DEF) +/* V4L2 private controls */ +#define V4L2_CID_UVC_REGION_OF_INTEREST_RECT (V4L2_CID_CAMERA_UVC_BASE+1) +#define V4L2_CID_UVC_REGION_OF_INTEREST_AUTO (V4L2_CID_CAMERA_UVC_BASE+2) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_EXPOSURE (1 << 0) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IRIS (1 << 1) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_WHITE_BALANCE (1 << 2) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FOCUS (1 << 3) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FACE_DETECT (1 << 4) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_DETECT_AND_TRACK (1 << 5) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IMAGE_STABILIZATION (1 << 6) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_HIGHER_QUALITY (1 << 7) +struct uvc_menu_info {__u32 value;__u8 name[32 ];
include/uapi/linux/v4l2-controls.h +8 -0
@@ -1008,6 +1008,14 @@ enum v4l2_auto_focus_range {#define V4L2_CID_CAMERA_SENSOR_ROTATION (V4L2_CID_CAMERA_CLASS_BASE+35) +/* CAMERA-class private control IDs */ + +/* +* The base for the uvc driver controls. See linux/uvcvideo.h for the list +* of controls. We reserve 16 controls for this driver. +*/ +#define V4L2_CID_CAMERA_UVC_BASE (V4L2_CID_CAMERA_CLASS_BASE + 0x1000) +/* FM Modulator class control IDs */ #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900)
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
Re: [PATCH v5 3/5] media: uvcvideo: implement UVC v1.5 ROI
Hi Yunke,
thanks for your patch
Quoted 117 lines · Yunke Cao
Implement support for ROI as described in UVC 1.5:
4.2.2.1.20 Digital Region of Interest (ROI) ControlROI control is implemented using V4L2 control API as two uvc-specific controls:
V4L2_CID_UVC_REGION_OF_INTEREST_RECTandV4L2_CID_UVC_REGION_OF_INTEREST_AUTO.Signed-off-by Yunke Cao <[email protected]>---
References a rejected attempt that uses v4l2 selection API:
https://lore.kernel.org/lkml/[email protected]
Changelog since v4:(quoted diff) +0
-3-Check boundary condition: width or height == 0. -Populate xctrl->id and xctrl->size. -Split code for V4L2_CTRL_WHICH_MIN/MAX_VAL to patch 4/5. drivers/media/usb/uvc/uvc_ctrl.c | 207 ++++++++++++++++++++++++++--- drivers/media/usb/uvc/uvc_v4l2.c | 8 +- drivers/media/usb/uvc/uvcvideo.h | 10 +- include/uapi/linux/usb/video.h | 1 + include/uapi/linux/uvcvideo.h | 13 ++ include/uapi/linux/v4l2-controls.h | 8 ++ 6 files changed, 223 insertions(+), 24 deletions(-)drivers/media/usb/uvc/uvc_ctrl.c +62
-0@@ -355,6 +355,16 @@ static const struct uvc_control_info uvc_ctrls[] = { .flags = UVC_CTRL_FLAG_GET_CUR | UVC_CTRL_FLAG_AUTO_UPDATE, }, + { + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .index = 21, + .size = 10, + .flags =UVC_CTRL_FLAG_SET_CUR |UVC_CTRL_FLAG_GET_CUR + |UVC_CTRL_FLAG_GET_MIN |UVC_CTRL_FLAG_GET_MAX + |UVC_CTRL_FLAG_GET_DEF + | UVC_CTRL_FLAG_AUTO_UPDATE, + }, }; static const u32 uvc_control_classes[] = {@@ -728,6 +738,24 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, }, + { + .id = V4L2_CID_UVC_REGION_OF_INTEREST_RECT, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .size = 64, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_RECT, + .data_type = UVC_CTRL_DATA_TYPE_RECT, + }, + { + .id = V4L2_CID_UVC_REGION_OF_INTEREST_AUTO, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .size = 16, + .offset = 64, + .v4l2_type = V4L2_CTRL_TYPE_BITMASK, + .data_type = UVC_CTRL_DATA_TYPE_BITMASK, + }, };/* ------------------------------------------------------------------------ @@ -749,6 +777,34 @@ static inline void uvc_clear_bit(u8 *data, int bit) data[bit >>3 ] &= ~(1 << (bit &7 )); } +static void uvc_to_v4l2_rect (struct v4l2_rect *v4l2_rect, +const struct uvc_rect *uvc_rect) +{ + v4l2_rect->top = uvc_rect->top; + v4l2_rect->left = uvc_rect->left; + v4l2_rect->height = uvc_rect->bottom - uvc_rect->top +1 ; + v4l2_rect->width = uvc_rect->right - uvc_rect->left +1 ; +} + +static int v4l2_to_uvc_rect (struct uvc_rect *uvc_rect, +const struct v4l2_rect *v4l2_rect) +{ +// Safely converts s32 and u32 to u16. +if (v4l2_rect->top >U16_MAX || v4l2_rect->top <0 || + v4l2_rect->left >U16_MAX || v4l2_rect->left <0 || + v4l2_rect->height >U16_MAX || v4l2_rect->height ==0 || + v4l2_rect->width >U16_MAX || v4l2_rect->width ==0 || + v4l2_rect->height + v4l2_rect->top -1 >U16_MAX || + v4l2_rect->width + v4l2_rect->left -1 >U16_MAX ) +return -ERANGE ; + + uvc_rect->top = v4l2_rect->top; + uvc_rect->left = v4l2_rect->left; + uvc_rect->bottom = v4l2_rect->height + v4l2_rect->top -1 ; + uvc_rect->right = v4l2_rect->width + v4l2_rect->left -1 ; +return 0 ; +} +/* Extract the bit string specified by mapping->offset and mapping->size * from the little-endian data stored at 'data' and return the result as * a signed 32bit integer. Sign extension will be performed if the mapping @@ -963,11 +1019,23 @@ static s32 __uvc_ctrl_get_value(struct uvc_control_mapping *mapping,return value; } +static void __uvc_ctrl_get_v4l2_rect (struct uvc_control *ctrl, +struct uvc_control_mapping *mapping, +u32 id, +struct v4l2_rect *rect) +{ + struct uvc_rect *uvc_rect =
drivers/media/usb/uvc/uvc_ctrl.c static s32 __uvc_ctrl_get_value(struct uvc_control_mapping *mapping, · line 1036
Quoted 10 lines
drivers/media/usb/uvc/uvc_ctrl.c +6
-1+ (struct uvc_rect *)(uvc_ctrl_data (ctrl, id) + + mapping->offset /8 ); +uvc_to_v4l2_rect (rect, uvc_rect); +} +static int __uvc_ctrl_get (struct uvc_video_chain *chain,struct uvc_control *ctrl,struct uvc_control_mapping *mapping, -s32 *value) +struct v4l2_ext_control *xctrl) {
We need to be a bit careful here. Now we need that xctrl->p_rect points to a correct location and that is not true in other parts of the code.
Maybe you want to want to make
__uvc_ctrl_get-> return -EINVAL for for V4L2_CTRL_TYPE_RECT
and a new
__uvc_ctrl_get_p_rect_to_user (and tha way me make explicit the namespace)
Quoted 84 lines
drivers/media/usb/uvc/uvc_ctrl.c +25
-12int ret; +struct v4l2_rect v4l2_rect = {};if ((ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR ) ==0 )return -EACCES ;@@ -993,8 +1061,19 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, ctrl->loaded =1 ; } - *value =__uvc_ctrl_get_value (mapping, + xctrl->id = mapping->id; +switch (mapping->v4l2_type) { +case V4L2_CTRL_TYPE_RECT : +__uvc_ctrl_get_v4l2_rect (ctrl, mapping,UVC_CTRL_DATA_CURRENT , + &v4l2_rect); + xctrl->size =sizeof (v4l2_rect); +return copy_to_user (xctrl->p_rect, &v4l2_rect, +sizeof (v4l2_rect)); + +default : + xctrl->value =__uvc_ctrl_get_value (mapping,uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); + }return 0 ; }@@ -1104,13 +1183,14 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,__uvc_find_control (ctrl->entity, mapping->master_id, &master_map, &master_ctrl,0 );if (master_ctrl && (master_ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR )) { -s32 val; -int ret =__uvc_ctrl_get (chain, master_ctrl, master_map, &val); +struct v4l2_ext_control xctrl; +int ret = +__uvc_ctrl_get (chain, master_ctrl, master_map, &xctrl);if (ret <0 )return ret; -if (val != mapping->master_manual) - v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; +if (xctrl.value != mapping->master_manual) + v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; }if (!ctrl->cached) {@@ -1344,16 +1424,16 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain,struct uvc_control_mapping *mapping =NULL ;struct uvc_control *ctrl =NULL ;u32 changes =V4L2_EVENT_CTRL_CH_FLAGS ; -s32 val =0 ; +struct v4l2_ext_control xctrl;__uvc_find_control (master->entity, slave_id, &mapping, &ctrl,0 );if (ctrl ==NULL )return ; -if (__uvc_ctrl_get (chain, ctrl, mapping, &val) ==0 ) +if (__uvc_ctrl_get (chain, ctrl, mapping, &xctrl) ==0 ) changes |=V4L2_EVENT_CTRL_CH_VALUE ; -uvc_ctrl_send_event (chain, handle, ctrl, mapping, val, changes); +uvc_ctrl_send_event (chain, handle, ctrl, mapping, xctrl.value, changes); } void uvc_ctrl_status_event(struct uvc_video_chain *chain,@@ -1515,13 +1595,13 @@ static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev, unsigned elems)if (sev->flags &V4L2_EVENT_SUB_FL_SEND_INITIAL ) {struct v4l2_event ev;u32 changes =V4L2_EVENT_CTRL_CH_FLAGS ; -s32 val =0 ; +struct v4l2_ext_control xctrl; -if (__uvc_ctrl_get (handle->chain, ctrl, mapping, &val) ==0 ) +if (__uvc_ctrl_get (handle->chain, ctrl, mapping, &xctrl) ==0 ) changes |=V4L2_EVENT_CTRL_CH_VALUE ; -uvc_ctrl_fill_event (handle->chain, &ev, ctrl, mapping, val, - changes); +uvc_ctrl_fill_event (handle->chain, &ev, ctrl, mapping, + xctrl.value, changes);/* Mark the queue as active, allowing this initial event to be accepted. */ sev->elems = elems;
drivers/media/usb/uvc/uvc_ctrl.c int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, · line 1763
Quoted 2 lines
drivers/media/usb/uvc/uvc_ctrl.c +0
-0@@ -1682,10 +1762,14 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, }
Please move this change to the other patch
Quoted 280 lines
drivers/media/usb/uvc/uvc_ctrl.c +97
-4int uvc_ctrl_get (struct uvc_video_chain *chain, -struct v4l2_ext_control *xctrl) +struct v4l2_ext_control *xctrl,u32 v4l2_which) {struct uvc_control *ctrl;struct uvc_control_mapping *mapping; +int ret; +u32 flag; +u32 id; +u8 query;if (__uvc_query_v4l2_class (chain, xctrl->id,0 ) >=0 )return -EACCES ;@@ -1694,7 +1778,36 @@ int uvc_ctrl_get(struct uvc_video_chain *chain,if (ctrl ==NULL )return -EINVAL ; -return __uvc_ctrl_get (chain, ctrl, mapping, &xctrl->value); +switch (v4l2_which) { +case V4L2_CTRL_WHICH_DEF_VAL : + flag =UVC_CTRL_FLAG_GET_DEF ; + id =UVC_CTRL_DATA_DEF ; + query =UVC_GET_DEF ; +break ; +case V4L2_CTRL_WHICH_CUR_VAL : +default : +return __uvc_ctrl_get (chain, ctrl, mapping, xctrl); + } + +if (!ctrl->cached) { + ret =uvc_ctrl_populate_cache (chain, ctrl); +if (ret <0 ) +return ret; + } + +if (!(ctrl->info.flags & flag)) +return -EACCES ; + +if (mapping->v4l2_type ==V4L2_CTRL_TYPE_RECT ) { +struct v4l2_rect rect; + +__uvc_ctrl_get_v4l2_rect (ctrl, mapping, id, &rect); +return copy_to_user (xctrl->p_rect, &rect,sizeof (rect)); + } + + xctrl->value = mapping->get (mapping, query,uvc_ctrl_data (ctrl, id)); + +return 0 ; } int uvc_ctrl_set(struct uvc_fh *handle,@@ -1703,6 +1816,8 @@ int uvc_ctrl_set(struct uvc_fh *handle,struct uvc_video_chain *chain = handle->chain;struct uvc_control *ctrl;struct uvc_control_mapping *mapping; +struct v4l2_rect v4l2_rect; +struct uvc_rect uvc_rect;s32 value;u32 step;s32 min;@@ -1774,6 +1889,16 @@ int uvc_ctrl_set(struct uvc_fh *handle,break ; +case V4L2_CTRL_TYPE_RECT : + ret =copy_from_user (&v4l2_rect, xctrl->p_rect, +sizeof (v4l2_rect)); +if (ret <0 ) +return ret; + ret =v4l2_to_uvc_rect (&uvc_rect, &v4l2_rect); +if (ret <0 ) +return ret; +break ; +default : value = xctrl->value;break ;@@ -1807,8 +1932,16 @@ int uvc_ctrl_set(struct uvc_fh *handle, ctrl->info.size); } - mapping->set (mapping, value, -uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); +switch (mapping->data_type) { +case UVC_CTRL_DATA_TYPE_RECT : +memcpy (uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT ) + + mapping->offset /8 , + &uvc_rect,sizeof (uvc_rect)); +break ; +default : + mapping->set (mapping, value, +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); + }if (ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) ctrl->handle = handle;@@ -2366,6 +2499,40 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev, } } +static int uvc_ctrl_init_roi (struct uvc_device *dev,struct uvc_control *ctrl) +{ +int ret; + + ret =uvc_query_ctrl (dev,UVC_GET_DEF , ctrl->entity->id, dev->intfnum, +UVC_CT_REGION_OF_INTEREST_CONTROL , +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_DEF ), + ctrl->info.size); +if (ret) + goto out; + +/* +* Most firmwares have wrong GET_CURRENT configuration. E.g. it's +* below GET_MIN, or have rectangle coordinates mixed up. This +* causes problems sometimes, because we are unable to set +* auto-controls value without first setting ROI rectangle to +* valid configuration. +* +* We expect that default configuration is always correct and +* is within the GET_MIN / GET_MAX boundaries. +* +* Set current ROI configuration to GET_DEF, so that we will +* always have properly configured ROI. +*/ + ret =uvc_query_ctrl (dev,UVC_SET_CUR ,1 , dev->intfnum, +UVC_CT_REGION_OF_INTEREST_CONTROL , +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_DEF ), + ctrl->info.size); +out: +if (ret) +dev_err (&dev->udev->dev,"Failed to fixup ROI (%d).\n" , ret); +return ret; +} +/* * Add control information and hardcoded stock control mappings to the given * device. @@ -2378,6 +2545,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,const struct uvc_control_mapping *mapping = uvc_ctrl_mappings;const struct uvc_control_mapping *mend = mapping +ARRAY_SIZE (uvc_ctrl_mappings); +const u8 camera_entity[16 ] =UVC_GUID_UVC_CAMERA ;/* XU controls initialization requires querying the device for control * information. As some buggy UVC devices will crash when queried @@ -2398,6 +2566,11 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,* GET_INFO on standard controls. */ uvc_ctrl_get_flags (chain->dev, ctrl, &ctrl->info); + +if (ctrl->info.selector == +UVC_CT_REGION_OF_INTEREST_CONTROL && +uvc_entity_match_guid (ctrl->entity, camera_entity)) +uvc_ctrl_init_roi (chain->dev, ctrl);break ; } }drivers/media/usb/uvc/uvc_v4l2.c +2
-6@@ -1040,15 +1040,11 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,if (ctrls->which ==V4L2_CTRL_WHICH_DEF_VAL ) {for (i =0 ; i < ctrls->count; ++ctrl, ++i) { -struct v4l2_queryctrl qc = { .id = ctrl->id }; - - ret =uvc_query_v4l2_ctrl (chain, &qc); + ret =uvc_ctrl_get (chain, ctrl, ctrls->which);if (ret <0 ) { ctrls->error_idx = i;return ret; } - - ctrl->value = qc.default_value; }return 0 ;@@ -1059,7 +1055,7 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,return ret;for (i =0 ; i < ctrls->count; ++ctrl, ++i) { - ret =uvc_ctrl_get (chain, ctrl); + ret =uvc_ctrl_get (chain, ctrl, ctrls->which);if (ret <0 ) {uvc_ctrl_rollback (handle); ctrls->error_idx = i;drivers/media/usb/uvc/uvcvideo.h +9
-1@@ -424,6 +424,13 @@ struct uvc_streaming_header {u8 bTriggerUsage; }; +struct uvc_rect { +u16 top; +u16 left; +u16 bottom; +u16 right; +} __packed; +enum uvc_buffer_state {UVC_BUF_STATE_IDLE =0 ,UVC_BUF_STATE_QUEUED =1 ,@@ -897,7 +904,8 @@ static inline int uvc_ctrl_rollback(struct uvc_fh *handle)return __uvc_ctrl_commit (handle,1 ,NULL ); } -int uvc_ctrl_get (struct uvc_video_chain *chain,struct v4l2_ext_control *xctrl); +int uvc_ctrl_get (struct uvc_video_chain *chain,struct v4l2_ext_control *xctrl, +u32 v4l2_which);int uvc_ctrl_set (struct uvc_fh *handle,struct v4l2_ext_control *xctrl);int uvc_ctrl_is_accessible (struct uvc_video_chain *chain,u32 v4l2_id,bool read);include/uapi/linux/usb/video.h +1
-0@@ -104,6 +104,7 @@#define UVC_CT_ROLL_ABSOLUTE_CONTROL 0x0f#define UVC_CT_ROLL_RELATIVE_CONTROL 0x10#define UVC_CT_PRIVACY_CONTROL 0x11 +#define UVC_CT_REGION_OF_INTEREST_CONTROL 0x14/* A.9.5. Processing Unit Control Selectors */ #define UVC_PU_CONTROL_UNDEFINED 0x00include/uapi/linux/uvcvideo.h +13
-0@@ -16,6 +16,7 @@#define UVC_CTRL_DATA_TYPE_BOOLEAN 3#define UVC_CTRL_DATA_TYPE_ENUM 4#define UVC_CTRL_DATA_TYPE_BITMASK 5 +#define UVC_CTRL_DATA_TYPE_RECT 6/* Control flags */ #define UVC_CTRL_FLAG_SET_CUR (1 << 0)@@ -36,6 +37,18 @@ UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES | \ UVC_CTRL_FLAG_GET_DEF) +/* V4L2 private controls */ +#define V4L2_CID_UVC_REGION_OF_INTEREST_RECT (V4L2_CID_CAMERA_UVC_BASE+1) +#define V4L2_CID_UVC_REGION_OF_INTEREST_AUTO (V4L2_CID_CAMERA_UVC_BASE+2) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_EXPOSURE (1 << 0) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IRIS (1 << 1) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_WHITE_BALANCE (1 << 2) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FOCUS (1 << 3) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FACE_DETECT (1 << 4) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_DETECT_AND_TRACK (1 << 5) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IMAGE_STABILIZATION (1 << 6) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_HIGHER_QUALITY (1 << 7) +struct uvc_menu_info {__u32 value;__u8 name[32 ];include/uapi/linux/v4l2-controls.h +8
-1@@ -1008,6 +1008,14 @@ enum v4l2_auto_focus_range {#define V4L2_CID_CAMERA_SENSOR_ROTATION (V4L2_CID_CAMERA_CLASS_BASE+35) +/* CAMERA-class private control IDs */ + +/* +* The base for the uvc driver controls. See linux/uvcvideo.h for the list +* of controls. We reserve 16 controls for this driver. +*/ +#define V4L2_CID_CAMERA_UVC_BASE (V4L2_CID_CAMERA_CLASS_BASE + 0x1000) +/* FM Modulator class control IDs */ #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) --2.36.1.124.g0e6072fb45-goog
Signature · 1 line
Ricardo Ribalda
Re: [PATCH v5 3/5] media: uvcvideo: implement UVC v1.5 ROI
Thanks for the review.
Quoted 138 lines · Ricardo Ribalda
Hi Yunke,
thanks for your patch
Quoted 117 lines · Yunke Cao
Implement support for ROI as described in UVC 1.5:
4.2.2.1.20 Digital Region of Interest (ROI) ControlROI control is implemented using V4L2 control API as two uvc-specific controls:
V4L2_CID_UVC_REGION_OF_INTEREST_RECTandV4L2_CID_UVC_REGION_OF_INTEREST_AUTO.Signed-off-by Yunke Cao <[email protected]>---
References a rejected attempt that uses v4l2 selection API:
https://lore.kernel.org/lkml/[email protected]
Changelog since v4:(quoted diff) +0
-3-Check boundary condition: width or height == 0. -Populate xctrl->id and xctrl->size. -Split code for V4L2_CTRL_WHICH_MIN/MAX_VAL to patch 4/5. drivers/media/usb/uvc/uvc_ctrl.c | 207 ++++++++++++++++++++++++++--- drivers/media/usb/uvc/uvc_v4l2.c | 8 +- drivers/media/usb/uvc/uvcvideo.h | 10 +- include/uapi/linux/usb/video.h | 1 + include/uapi/linux/uvcvideo.h | 13 ++ include/uapi/linux/v4l2-controls.h | 8 ++ 6 files changed, 223 insertions(+), 24 deletions(-)drivers/media/usb/uvc/uvc_ctrl.c +62
-0@@ -355,6 +355,16 @@ static const struct uvc_control_info uvc_ctrls[] = { .flags = UVC_CTRL_FLAG_GET_CUR | UVC_CTRL_FLAG_AUTO_UPDATE, }, + { + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .index = 21, + .size = 10, + .flags =UVC_CTRL_FLAG_SET_CUR |UVC_CTRL_FLAG_GET_CUR + |UVC_CTRL_FLAG_GET_MIN |UVC_CTRL_FLAG_GET_MAX + |UVC_CTRL_FLAG_GET_DEF + | UVC_CTRL_FLAG_AUTO_UPDATE, + }, }; static const u32 uvc_control_classes[] = {@@ -728,6 +738,24 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, }, + { + .id = V4L2_CID_UVC_REGION_OF_INTEREST_RECT, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .size = 64, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_RECT, + .data_type = UVC_CTRL_DATA_TYPE_RECT, + }, + { + .id = V4L2_CID_UVC_REGION_OF_INTEREST_AUTO, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, + .size = 16, + .offset = 64, + .v4l2_type = V4L2_CTRL_TYPE_BITMASK, + .data_type = UVC_CTRL_DATA_TYPE_BITMASK, + }, };/* ------------------------------------------------------------------------ @@ -749,6 +777,34 @@ static inline void uvc_clear_bit(u8 *data, int bit) data[bit >>3 ] &= ~(1 << (bit &7 )); } +static void uvc_to_v4l2_rect (struct v4l2_rect *v4l2_rect, +const struct uvc_rect *uvc_rect) +{ + v4l2_rect->top = uvc_rect->top; + v4l2_rect->left = uvc_rect->left; + v4l2_rect->height = uvc_rect->bottom - uvc_rect->top +1 ; + v4l2_rect->width = uvc_rect->right - uvc_rect->left +1 ; +} + +static int v4l2_to_uvc_rect (struct uvc_rect *uvc_rect, +const struct v4l2_rect *v4l2_rect) +{ +// Safely converts s32 and u32 to u16. +if (v4l2_rect->top >U16_MAX || v4l2_rect->top <0 || + v4l2_rect->left >U16_MAX || v4l2_rect->left <0 || + v4l2_rect->height >U16_MAX || v4l2_rect->height ==0 || + v4l2_rect->width >U16_MAX || v4l2_rect->width ==0 || + v4l2_rect->height + v4l2_rect->top -1 >U16_MAX || + v4l2_rect->width + v4l2_rect->left -1 >U16_MAX ) +return -ERANGE ; + + uvc_rect->top = v4l2_rect->top; + uvc_rect->left = v4l2_rect->left; + uvc_rect->bottom = v4l2_rect->height + v4l2_rect->top -1 ; + uvc_rect->right = v4l2_rect->width + v4l2_rect->left -1 ; +return 0 ; +} +/* Extract the bit string specified by mapping->offset and mapping->size * from the little-endian data stored at 'data' and return the result as * a signed 32bit integer. Sign extension will be performed if the mapping @@ -963,11 +1019,23 @@ static s32 __uvc_ctrl_get_value(struct uvc_control_mapping *mapping,return value; } +static void __uvc_ctrl_get_v4l2_rect (struct uvc_control *ctrl, +struct uvc_control_mapping *mapping, +u32 id, +struct v4l2_rect *rect) +{ + struct uvc_rect *uvc_rect =drivers/media/usb/uvc/uvc_ctrl.c static s32 __uvc_ctrl_get_value(struct uvc_control_mapping *mapping, · line 1036
Quoted 10 lines
drivers/media/usb/uvc/uvc_ctrl.c +6
-1+ (struct uvc_rect *)(uvc_ctrl_data (ctrl, id) + + mapping->offset /8 ); +uvc_to_v4l2_rect (rect, uvc_rect); +} +static int __uvc_ctrl_get (struct uvc_video_chain *chain,struct uvc_control *ctrl,struct uvc_control_mapping *mapping, -s32 *value) +struct v4l2_ext_control *xctrl) {We need to be a bit careful here. Now we need that
xctrl->p_rectpoints to a correct location and that is not true in other parts of the code.
Quoted 8 lines
Maybe you want to want to make
__uvc_ctrl_get-> return
-EINVALfor forV4L2_CTRL_TYPE_RECTand a new
__uvc_ctrl_get_p_rect_to_user(and tha way me make explicit the namespace)
Ok. Will do that in V6.
Quoted 76 lines
Quoted 76 lines
drivers/media/usb/uvc/uvc_ctrl.c +23
-10int ret; +struct v4l2_rect v4l2_rect = {};if ((ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR ) ==0 )return -EACCES ;@@ -993,8 +1061,19 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, ctrl->loaded =1 ; } - *value =__uvc_ctrl_get_value (mapping, + xctrl->id = mapping->id; +switch (mapping->v4l2_type) { +case V4L2_CTRL_TYPE_RECT : +__uvc_ctrl_get_v4l2_rect (ctrl, mapping,UVC_CTRL_DATA_CURRENT , + &v4l2_rect); + xctrl->size =sizeof (v4l2_rect); +return copy_to_user (xctrl->p_rect, &v4l2_rect, +sizeof (v4l2_rect)); + +default : + xctrl->value =__uvc_ctrl_get_value (mapping,uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); + }return 0 ; }@@ -1104,13 +1183,14 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,__uvc_find_control (ctrl->entity, mapping->master_id, &master_map, &master_ctrl,0 );if (master_ctrl && (master_ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR )) { -s32 val; -int ret =__uvc_ctrl_get (chain, master_ctrl, master_map, &val); +struct v4l2_ext_control xctrl; +int ret = +__uvc_ctrl_get (chain, master_ctrl, master_map, &xctrl);if (ret <0 )return ret; -if (val != mapping->master_manual) - v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; +if (xctrl.value != mapping->master_manual) + v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; }if (!ctrl->cached) {@@ -1344,16 +1424,16 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain,struct uvc_control_mapping *mapping =NULL ;struct uvc_control *ctrl =NULL ;u32 changes =V4L2_EVENT_CTRL_CH_FLAGS ; -s32 val =0 ; +struct v4l2_ext_control xctrl;__uvc_find_control (master->entity, slave_id, &mapping, &ctrl,0 );if (ctrl ==NULL )return ; -if (__uvc_ctrl_get (chain, ctrl, mapping, &val) ==0 ) +if (__uvc_ctrl_get (chain, ctrl, mapping, &xctrl) ==0 ) changes |=V4L2_EVENT_CTRL_CH_VALUE ; -uvc_ctrl_send_event (chain, handle, ctrl, mapping, val, changes); +uvc_ctrl_send_event (chain, handle, ctrl, mapping, xctrl.value, changes); } void uvc_ctrl_status_event(struct uvc_video_chain *chain,@@ -1515,13 +1595,13 @@ static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev, unsigned elems)if (sev->flags &V4L2_EVENT_SUB_FL_SEND_INITIAL ) {struct v4l2_event ev;u32 changes =V4L2_EVENT_CTRL_CH_FLAGS ; -s32 val =0 ; +struct v4l2_ext_control xctrl; -if (__uvc_ctrl_get (handle->chain, ctrl, mapping, &val) ==0 ) +if (__uvc_ctrl_get (handle->chain, ctrl, mapping, &xctrl) ==0 ) changes |=V4L2_EVENT_CTRL_CH_VALUE ;
Quoted 12 lines
drivers/media/usb/uvc/uvc_ctrl.c int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, · line 1763
Quoted 10 lines
drivers/media/usb/uvc/uvc_ctrl.c +2
-2-uvc_ctrl_fill_event (handle->chain, &ev, ctrl, mapping, val, - changes); +uvc_ctrl_fill_event (handle->chain, &ev, ctrl, mapping, + xctrl.value, changes);/* Mark the queue as active, allowing this initial event to be accepted. */ sev->elems = elems;@@ -1682,10 +1762,14 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, }Please move this change to the other patch
I'm not sure we can do that.
Before this patch, uvc_ctrl_get only handled CUR, DEF was handled by uvc_query_v4l2_ctrl.
Now I changed to uvc_ctrl_get to handle CUR and DEF (+ MIN and MAX in 4/5). This way it's easier because we can't pass ptr controls easily in a v4l2_queryctrl.
We add v4l2_which as a parameter here to support V4L2_CTRL_WHICH_DEF_VAL.
Quoted 284 lines
Quoted 278 lines
drivers/media/usb/uvc/uvc_ctrl.c +97
-4int uvc_ctrl_get (struct uvc_video_chain *chain, -struct v4l2_ext_control *xctrl) +struct v4l2_ext_control *xctrl,u32 v4l2_which) {struct uvc_control *ctrl;struct uvc_control_mapping *mapping; +int ret; +u32 flag; +u32 id; +u8 query;if (__uvc_query_v4l2_class (chain, xctrl->id,0 ) >=0 )return -EACCES ;@@ -1694,7 +1778,36 @@ int uvc_ctrl_get(struct uvc_video_chain *chain,if (ctrl ==NULL )return -EINVAL ; -return __uvc_ctrl_get (chain, ctrl, mapping, &xctrl->value); +switch (v4l2_which) { +case V4L2_CTRL_WHICH_DEF_VAL : + flag =UVC_CTRL_FLAG_GET_DEF ; + id =UVC_CTRL_DATA_DEF ; + query =UVC_GET_DEF ; +break ; +case V4L2_CTRL_WHICH_CUR_VAL : +default : +return __uvc_ctrl_get (chain, ctrl, mapping, xctrl); + } + +if (!ctrl->cached) { + ret =uvc_ctrl_populate_cache (chain, ctrl); +if (ret <0 ) +return ret; + } + +if (!(ctrl->info.flags & flag)) +return -EACCES ; + +if (mapping->v4l2_type ==V4L2_CTRL_TYPE_RECT ) { +struct v4l2_rect rect; + +__uvc_ctrl_get_v4l2_rect (ctrl, mapping, id, &rect); +return copy_to_user (xctrl->p_rect, &rect,sizeof (rect)); + } + + xctrl->value = mapping->get (mapping, query,uvc_ctrl_data (ctrl, id)); + +return 0 ; } int uvc_ctrl_set(struct uvc_fh *handle,@@ -1703,6 +1816,8 @@ int uvc_ctrl_set(struct uvc_fh *handle,struct uvc_video_chain *chain = handle->chain;struct uvc_control *ctrl;struct uvc_control_mapping *mapping; +struct v4l2_rect v4l2_rect; +struct uvc_rect uvc_rect;s32 value;u32 step;s32 min;@@ -1774,6 +1889,16 @@ int uvc_ctrl_set(struct uvc_fh *handle,break ; +case V4L2_CTRL_TYPE_RECT : + ret =copy_from_user (&v4l2_rect, xctrl->p_rect, +sizeof (v4l2_rect)); +if (ret <0 ) +return ret; + ret =v4l2_to_uvc_rect (&uvc_rect, &v4l2_rect); +if (ret <0 ) +return ret; +break ; +default : value = xctrl->value;break ;@@ -1807,8 +1932,16 @@ int uvc_ctrl_set(struct uvc_fh *handle, ctrl->info.size); } - mapping->set (mapping, value, -uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); +switch (mapping->data_type) { +case UVC_CTRL_DATA_TYPE_RECT : +memcpy (uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT ) + + mapping->offset /8 , + &uvc_rect,sizeof (uvc_rect)); +break ; +default : + mapping->set (mapping, value, +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); + }if (ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) ctrl->handle = handle;@@ -2366,6 +2499,40 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev, } } +static int uvc_ctrl_init_roi (struct uvc_device *dev,struct uvc_control *ctrl) +{ +int ret; + + ret =uvc_query_ctrl (dev,UVC_GET_DEF , ctrl->entity->id, dev->intfnum, +UVC_CT_REGION_OF_INTEREST_CONTROL , +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_DEF ), + ctrl->info.size); +if (ret) + goto out; + +/* +* Most firmwares have wrong GET_CURRENT configuration. E.g. it's +* below GET_MIN, or have rectangle coordinates mixed up. This +* causes problems sometimes, because we are unable to set +* auto-controls value without first setting ROI rectangle to +* valid configuration. +* +* We expect that default configuration is always correct and +* is within the GET_MIN / GET_MAX boundaries. +* +* Set current ROI configuration to GET_DEF, so that we will +* always have properly configured ROI. +*/ + ret =uvc_query_ctrl (dev,UVC_SET_CUR ,1 , dev->intfnum, +UVC_CT_REGION_OF_INTEREST_CONTROL , +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_DEF ), + ctrl->info.size); +out: +if (ret) +dev_err (&dev->udev->dev,"Failed to fixup ROI (%d).\n" , ret); +return ret; +} +/* * Add control information and hardcoded stock control mappings to the given * device. @@ -2378,6 +2545,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,const struct uvc_control_mapping *mapping = uvc_ctrl_mappings;const struct uvc_control_mapping *mend = mapping +ARRAY_SIZE (uvc_ctrl_mappings); +const u8 camera_entity[16 ] =UVC_GUID_UVC_CAMERA ;/* XU controls initialization requires querying the device for control * information. As some buggy UVC devices will crash when queried @@ -2398,6 +2566,11 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,* GET_INFO on standard controls. */ uvc_ctrl_get_flags (chain->dev, ctrl, &ctrl->info); + +if (ctrl->info.selector == +UVC_CT_REGION_OF_INTEREST_CONTROL && +uvc_entity_match_guid (ctrl->entity, camera_entity)) +uvc_ctrl_init_roi (chain->dev, ctrl);break ; } }drivers/media/usb/uvc/uvc_v4l2.c +2
-6@@ -1040,15 +1040,11 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,if (ctrls->which ==V4L2_CTRL_WHICH_DEF_VAL ) {for (i =0 ; i < ctrls->count; ++ctrl, ++i) { -struct v4l2_queryctrl qc = { .id = ctrl->id }; - - ret =uvc_query_v4l2_ctrl (chain, &qc); + ret =uvc_ctrl_get (chain, ctrl, ctrls->which);if (ret <0 ) { ctrls->error_idx = i;return ret; } - - ctrl->value = qc.default_value; }return 0 ;@@ -1059,7 +1055,7 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,return ret;for (i =0 ; i < ctrls->count; ++ctrl, ++i) { - ret =uvc_ctrl_get (chain, ctrl); + ret =uvc_ctrl_get (chain, ctrl, ctrls->which);if (ret <0 ) {uvc_ctrl_rollback (handle); ctrls->error_idx = i;drivers/media/usb/uvc/uvcvideo.h +9
-1@@ -424,6 +424,13 @@ struct uvc_streaming_header {u8 bTriggerUsage; }; +struct uvc_rect { +u16 top; +u16 left; +u16 bottom; +u16 right; +} __packed; +enum uvc_buffer_state {UVC_BUF_STATE_IDLE =0 ,UVC_BUF_STATE_QUEUED =1 ,@@ -897,7 +904,8 @@ static inline int uvc_ctrl_rollback(struct uvc_fh *handle)return __uvc_ctrl_commit (handle,1 ,NULL ); } -int uvc_ctrl_get (struct uvc_video_chain *chain,struct v4l2_ext_control *xctrl); +int uvc_ctrl_get (struct uvc_video_chain *chain,struct v4l2_ext_control *xctrl, +u32 v4l2_which);int uvc_ctrl_set (struct uvc_fh *handle,struct v4l2_ext_control *xctrl);int uvc_ctrl_is_accessible (struct uvc_video_chain *chain,u32 v4l2_id,bool read);include/uapi/linux/usb/video.h +1
-0@@ -104,6 +104,7 @@#define UVC_CT_ROLL_ABSOLUTE_CONTROL 0x0f#define UVC_CT_ROLL_RELATIVE_CONTROL 0x10#define UVC_CT_PRIVACY_CONTROL 0x11 +#define UVC_CT_REGION_OF_INTEREST_CONTROL 0x14/* A.9.5. Processing Unit Control Selectors */ #define UVC_PU_CONTROL_UNDEFINED 0x00include/uapi/linux/uvcvideo.h +13
-0@@ -16,6 +16,7 @@#define UVC_CTRL_DATA_TYPE_BOOLEAN 3#define UVC_CTRL_DATA_TYPE_ENUM 4#define UVC_CTRL_DATA_TYPE_BITMASK 5 +#define UVC_CTRL_DATA_TYPE_RECT 6/* Control flags */ #define UVC_CTRL_FLAG_SET_CUR (1 << 0)@@ -36,6 +37,18 @@ UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES | \ UVC_CTRL_FLAG_GET_DEF) +/* V4L2 private controls */ +#define V4L2_CID_UVC_REGION_OF_INTEREST_RECT (V4L2_CID_CAMERA_UVC_BASE+1) +#define V4L2_CID_UVC_REGION_OF_INTEREST_AUTO (V4L2_CID_CAMERA_UVC_BASE+2) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_EXPOSURE (1 << 0) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IRIS (1 << 1) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_WHITE_BALANCE (1 << 2) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FOCUS (1 << 3) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FACE_DETECT (1 << 4) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_DETECT_AND_TRACK (1 << 5) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IMAGE_STABILIZATION (1 << 6) +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_HIGHER_QUALITY (1 << 7) +struct uvc_menu_info {__u32 value;__u8 name[32 ];include/uapi/linux/v4l2-controls.h +8
-1@@ -1008,6 +1008,14 @@ enum v4l2_auto_focus_range {#define V4L2_CID_CAMERA_SENSOR_ROTATION (V4L2_CID_CAMERA_CLASS_BASE+35) +/* CAMERA-class private control IDs */ + +/* +* The base for the uvc driver controls. See linux/uvcvideo.h for the list +* of controls. We reserve 16 controls for this driver. +*/ +#define V4L2_CID_CAMERA_UVC_BASE (V4L2_CID_CAMERA_CLASS_BASE + 0x1000) +/* FM Modulator class control IDs */ #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) --Quoted 2 lines
2.36.1.124.g0e6072fb45-goog
--
Ricardo Ribalda
Re: [PATCH v5 3/5] media: uvcvideo: implement UVC v1.5 ROI
In reply to Yunke CaoQuoted 8 lines · Yunke Cao
Implement support for ROI as described in UVC 1.5:
4.2.2.1.20 Digital Region of Interest (ROI) ControlROI control is implemented using V4L2 control API as two uvc-specific controls:
V4L2_CID_UVC_REGION_OF_INTEREST_RECTandV4L2_CID_UVC_REGION_OF_INTEREST_AUTO.
Just for information, several nitpicks from checkpatch
CHECK: Alignment should match open parenthesis #75: FILE: drivers/media/usb/uvc/uvc_ctrl.c:781:
+static void uvc_to_v4l2_rect(struct v4l2_rect *v4l2_rect,
+ const struct uvc_rect *uvc_rect)
CHECK: Alignment should match open parenthesis #84: FILE: drivers/media/usb/uvc/uvc_ctrl.c:790:
+static int v4l2_to_uvc_rect(struct uvc_rect *uvc_rect,
+ const struct v4l2_rect *v4l2_rect)
CHECK: Alignment should match open parenthesis
#146: FILE: drivers/media/usb/uvc/uvc_ctrl.c:1075:
+ xctrl->value = __uvc_ctrl_get_value(mapping,
uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT));
CHECK: Alignment should match open parenthesis #204: FILE: drivers/media/usb/uvc/uvc_ctrl.c:1604:
+ uvc_ctrl_fill_event(handle->chain, &ev, ctrl, mapping,
+ xctrl.value, changes);
CHECK: Alignment should match open parenthesis #277: FILE: drivers/media/usb/uvc/uvc_ctrl.c:1894:
+ ret = copy_from_user(&v4l2_rect, xctrl->p_rect,
+ sizeof(v4l2_rect));
CHECK: spaces preferred around that '+' (ctx:VxV)
#455: FILE: include/uapi/linux/uvcvideo.h:41:
+#define V4L2_CID_UVC_REGION_OF_INTEREST_RECT (V4L2_CID_CAMERA_UVC_BASE+1)
^
CHECK: spaces preferred around that '+' (ctx:VxV)
#456: FILE: include/uapi/linux/uvcvideo.h:42:
+#define V4L2_CID_UVC_REGION_OF_INTEREST_AUTO (V4L2_CID_CAMERA_UVC_BASE+2)
^
PATCH v5 4/5 media: uvcvideo: support V4L2_CTRL_WHICH_MIN/MAX_VAL
In reply to Yunke CaoAdd support for V4L2_CTRL_WHICH_MIN/MAX_VAL in uvc driver. It is useful for the V4L2_CID_UVC_REGION_OF_INTEREST_RECT control.
--- drivers/media/usb/uvc/uvc_ctrl.c | 10 ++++++++++ drivers/media/usb/uvc/uvc_v4l2.c | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_ctrl.c +10 -0
@@ -1784,6 +1784,16 @@ int uvc_ctrl_get(struct uvc_video_chain *chain, id =UVC_CTRL_DATA_DEF ; query =UVC_GET_DEF ;break ; +case V4L2_CTRL_WHICH_MIN_VAL : + flag =UVC_CTRL_FLAG_GET_MIN ; + id =UVC_CTRL_DATA_MIN ; + query =UVC_GET_MIN ; +break ; +case V4L2_CTRL_WHICH_MAX_VAL : + flag =UVC_CTRL_FLAG_GET_MAX ; + id =UVC_CTRL_DATA_MAX ; + query =UVC_GET_MAX ; +break ;case V4L2_CTRL_WHICH_CUR_VAL :default :return __uvc_ctrl_get (chain, ctrl, mapping, xctrl);
drivers/media/usb/uvc/uvc_v4l2.c +3 -1
@@ -1038,7 +1038,9 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,if (ret <0 )return ret; -if (ctrls->which ==V4L2_CTRL_WHICH_DEF_VAL ) { +if (ctrls->which ==V4L2_CTRL_WHICH_DEF_VAL || + ctrls->which ==V4L2_CTRL_WHICH_MIN_VAL || + ctrls->which ==V4L2_CTRL_WHICH_MAX_VAL ) {for (i =0 ; i < ctrls->count; ++ctrl, ++i) { ret =uvc_ctrl_get (chain, ctrl, ctrls->which);if (ret <0 ) {
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
PATCH v5 5/5 media: uvcvideo: document UVC v1.5 ROI
In reply to Yunke CaoAdded documentation of V4L2_CID_UVC_REGION_OF_INTEREST_RECT and V4L2_CID_UVC_REGION_OF_INTEREST_AUTO.
---
Changelog since v4:
-Reword the documentation.
-Mention ROI is in global sensor coordinates.
.../userspace-api/media/drivers/uvcvideo.rst | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+)
Documentation/userspace-api/media/drivers/uvcvideo.rst +61 -0
@@ -181,6 +181,7 @@ Argument: struct uvc_xu_control_mapping UVC_CTRL_DATA_TYPE_BOOLEAN Boolean UVC_CTRL_DATA_TYPE_ENUM Enumeration UVC_CTRL_DATA_TYPE_BITMASK Bitmask + UVC_CTRL_DATA_TYPE_RECT Rectangular area UVCIOC_CTRL_QUERY - Query a UVC XU control
@@ -255,3 +256,63 @@ Argument: struct uvc_xu_control_query __u8 query Request code to send to the device __u16 size Control data size (in bytes) __u8 *data Control value + +Private V4L2 controls +--------------------- + +A few UVC specific V4L2 control IDs are listed below. + +``V4L2_CID_UVC_REGION_OF_INTEREST_RECT (struct)`` + This control determines the region of interest (ROI). ROI is an + rectangular area represented by a struct :c:type:`v4l2_rect`. The + rectangle is in global sensor coordinates and pixel units. It is + independent of the field of view, not impacted by any cropping or + scaling. + + Use ``V4L2_CTRL_WHICH_MIN_VAL`` and ``V4L2_CTRL_WHICH_MAX_VAL`` to query + the range of rectangle sizes. For example, a device can have a minimum + ROI rectangle of 1x1@0x0 and a maximum of 640x480@0x0. + + Setting a ROI allows the camera to optimize the capture for the region. + The value of ``V4L2_CID_REGION_OF_INTEREST_AUTO`` control determines + the detailed behavior. + + +``V4L2_CID_UVC_REGION_OF_INTEREST_AUTO (bitmask)`` + This determines which, if any, on board features should track to the + Region of Interest specified by the current value of + ``V4L2_CID_UVD__REGION_OF_INTEREST_RECT``. + + Max value is a mask indicating all supported Auto + Controls. + +.. flat-table:: + :header-rows: 0 + :stub-columns: 0 + + * - ``V4L2_REGION_OF_INTEREST_AUTO_EXPOSURE`` + - Setting this to true enables automatic exposure time for the specified + region. + * - ``V4L2_REGION_OF_INTEREST_AUTO_IRIS`` + - Setting this to true enables automatic iris aperture for the specified + region. + * - ``V4L2_REGION_OF_INTEREST_AUTO_WHITE_BALANCE`` + - Setting this to true enables automatic white balance adjustment for the + specified region. + * - ``V4L2_REGION_OF_INTEREST_AUTO_FOCUS`` + - Setting this to true enables automatic focus adjustment for the + specified region. + * - ``V4L2_REGION_OF_INTEREST_AUTO_FACE_DETECT`` + - Setting this to true enables automatic face detection for the + specified region. + * - ``V4L2_REGION_OF_INTEREST_AUTO_DETECT_AND_TRACK`` + - Setting this to true enables automatic face detection and tracking. The + current value of ``V4L2_CID_REGION_OF_INTEREST_RECT`` may be updated by + the driver. + * - ``V4L2_REGION_OF_INTEREST_AUTO_IMAGE_STABILIZATION`` + - Setting this to true enables automatic image stabilization. The + current value of ``V4L2_CID_REGION_OF_INTEREST_RECT`` may be updated by + the driver. + * - ``V4L2_REGION_OF_INTEREST_AUTO_HIGHER_QUALITY`` + - Setting this to true enables automatically capture the specified region + with higher quality if possible.
Signature · 1 line
2.36.1.124.g0e6072fb45-goog