| Message ID | 20250203-uvc-roi-v17-0-5900a9fed613@chromium.org |
|---|---|
| Headers | show |
| Series | media: uvcvideo: Implement UVC v1.5 ROI | expand |
Hi Ricardo, On 3-Feb-25 12:55 PM, Ricardo Ribalda wrote: > This patchset 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. > > The corresponding v4l-utils series can be found at > https://patchwork.linuxtv.org/project/linux-media/list/?series=11069 . > > Tested with v4l2-compliance, v4l2-ctl, calling ioctls on usb cameras and > VIVID with a newly added V4L2_CTRL_TYPE_RECT control. > > This set includes also the patch: > media: uvcvideo: Fix event flags in uvc_ctrl_send_events > It is not technically part of this change, but we conflict with it. > > I am continuing the work that Yunke did. > > Changes in v17: > - Rebase on latest media-committers/next > - Link to v16: https://lore.kernel.org/r/20241210-uvc-roi-v16-0-e8201f7e8e57@chromium.org Thank you for the rebased series. I've merge the entire series into: https://gitlab.freedesktop.org/linux-media/users/uvc/ -next now. Regards, Hans > Changes in v16: > - add documentation > - discard re-style > - refactor -ENOMEM > - remove "Use the camera to clamp compound controls" > - move uvc_rect > - data_out = 0 > - s/max/min in uvc_set_rect() > - Return -EINVAL in uvc_ioctl_xu_ctrl_map instead of -ENOTTY. > - Use switch inside uvc_set_le_value. > - Link to v15: https://lore.kernel.org/r/20241114-uvc-roi-v15-0-64cfeb56b6f8@chromium.org > > Changes in v15: > - Modify mapping set/get to support any size > - Remove v4l2_size field. It is not needed, we can use the v4l2_type to > infer it. > - Improve documentation. > - Lots of refactoring, now adding compound and roi are very small > patches. > - Remove rectangle clamping, not supported by some firmware. > - Remove init, we can add it later. > - Move uvc_cid to USER_BASE > > - Link to v14: https://lore.kernel.org/linux-media/20231201071907.3080126-1-yunkec@google.com/ > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > --- > Hans Verkuil (1): > media: v4l2-ctrls: add support for V4L2_CTRL_WHICH_MIN/MAX_VAL > > Ricardo Ribalda (10): > media: uvcvideo: Handle uvc menu translation inside uvc_get_le_value > media: uvcvideo: Handle uvc menu translation inside uvc_set_le_value > media: uvcvideo: refactor uvc_ioctl_g_ext_ctrls > media: uvcvideo: uvc_ioctl_(g|s)_ext_ctrls: handle NoP case > media: uvcvideo: Support any size for mapping get/set > media: uvcvideo: Factor out clamping from uvc_ctrl_set > media: uvcvideo: Factor out query_boundaries from query_ctrl > media: uvcvideo: let v4l2_query_v4l2_ctrl() work with v4l2_query_ext_ctrl > media: uvcvideo: Introduce uvc_mapping_v4l2_size > media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map > > Yunke Cao (6): > media: v4l2_ctrl: Add V4L2_CTRL_TYPE_RECT > media: vivid: Add a rectangle control > media: uvcvideo: add support for compound controls > media: uvcvideo: support V4L2_CTRL_WHICH_MIN/MAX_VAL > media: uvcvideo: implement UVC v1.5 ROI > media: uvcvideo: document UVC v1.5 ROI > > .../userspace-api/media/drivers/uvcvideo.rst | 64 ++ > .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 26 +- > .../userspace-api/media/v4l/vidioc-queryctrl.rst | 14 + > .../userspace-api/media/videodev2.h.rst.exceptions | 4 + > drivers/media/i2c/imx214.c | 4 +- > drivers/media/platform/qcom/venus/venc_ctrls.c | 9 +- > drivers/media/test-drivers/vivid/vivid-ctrls.c | 34 + > drivers/media/usb/uvc/uvc_ctrl.c | 799 ++++++++++++++++----- > drivers/media/usb/uvc/uvc_v4l2.c | 77 +- > drivers/media/usb/uvc/uvcvideo.h | 25 +- > drivers/media/v4l2-core/v4l2-ctrls-api.c | 54 +- > drivers/media/v4l2-core/v4l2-ctrls-core.c | 167 ++++- > drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- > include/media/v4l2-ctrls.h | 38 +- > include/uapi/linux/usb/video.h | 1 + > include/uapi/linux/uvcvideo.h | 13 + > include/uapi/linux/v4l2-controls.h | 7 + > include/uapi/linux/videodev2.h | 5 + > 18 files changed, 1058 insertions(+), 287 deletions(-) > --- > base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b > change-id: 20241113-uvc-roi-66bd6cfa1e64 > > Best regards,
This patchset 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. The corresponding v4l-utils series can be found at https://patchwork.linuxtv.org/project/linux-media/list/?series=11069 . Tested with v4l2-compliance, v4l2-ctl, calling ioctls on usb cameras and VIVID with a newly added V4L2_CTRL_TYPE_RECT control. This set includes also the patch: media: uvcvideo: Fix event flags in uvc_ctrl_send_events It is not technically part of this change, but we conflict with it. I am continuing the work that Yunke did. Changes in v17: - Rebase on latest media-committers/next - Link to v16: https://lore.kernel.org/r/20241210-uvc-roi-v16-0-e8201f7e8e57@chromium.org Changes in v16: - add documentation - discard re-style - refactor -ENOMEM - remove "Use the camera to clamp compound controls" - move uvc_rect - data_out = 0 - s/max/min in uvc_set_rect() - Return -EINVAL in uvc_ioctl_xu_ctrl_map instead of -ENOTTY. - Use switch inside uvc_set_le_value. - Link to v15: https://lore.kernel.org/r/20241114-uvc-roi-v15-0-64cfeb56b6f8@chromium.org Changes in v15: - Modify mapping set/get to support any size - Remove v4l2_size field. It is not needed, we can use the v4l2_type to infer it. - Improve documentation. - Lots of refactoring, now adding compound and roi are very small patches. - Remove rectangle clamping, not supported by some firmware. - Remove init, we can add it later. - Move uvc_cid to USER_BASE - Link to v14: https://lore.kernel.org/linux-media/20231201071907.3080126-1-yunkec@google.com/ Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- Hans Verkuil (1): media: v4l2-ctrls: add support for V4L2_CTRL_WHICH_MIN/MAX_VAL Ricardo Ribalda (10): media: uvcvideo: Handle uvc menu translation inside uvc_get_le_value media: uvcvideo: Handle uvc menu translation inside uvc_set_le_value media: uvcvideo: refactor uvc_ioctl_g_ext_ctrls media: uvcvideo: uvc_ioctl_(g|s)_ext_ctrls: handle NoP case media: uvcvideo: Support any size for mapping get/set media: uvcvideo: Factor out clamping from uvc_ctrl_set media: uvcvideo: Factor out query_boundaries from query_ctrl media: uvcvideo: let v4l2_query_v4l2_ctrl() work with v4l2_query_ext_ctrl media: uvcvideo: Introduce uvc_mapping_v4l2_size media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map Yunke Cao (6): media: v4l2_ctrl: Add V4L2_CTRL_TYPE_RECT media: vivid: Add a rectangle control media: uvcvideo: add support for compound controls media: uvcvideo: support V4L2_CTRL_WHICH_MIN/MAX_VAL media: uvcvideo: implement UVC v1.5 ROI media: uvcvideo: document UVC v1.5 ROI .../userspace-api/media/drivers/uvcvideo.rst | 64 ++ .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 26 +- .../userspace-api/media/v4l/vidioc-queryctrl.rst | 14 + .../userspace-api/media/videodev2.h.rst.exceptions | 4 + drivers/media/i2c/imx214.c | 4 +- drivers/media/platform/qcom/venus/venc_ctrls.c | 9 +- drivers/media/test-drivers/vivid/vivid-ctrls.c | 34 + drivers/media/usb/uvc/uvc_ctrl.c | 799 ++++++++++++++++----- drivers/media/usb/uvc/uvc_v4l2.c | 77 +- drivers/media/usb/uvc/uvcvideo.h | 25 +- drivers/media/v4l2-core/v4l2-ctrls-api.c | 54 +- drivers/media/v4l2-core/v4l2-ctrls-core.c | 167 ++++- drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- include/media/v4l2-ctrls.h | 38 +- include/uapi/linux/usb/video.h | 1 + include/uapi/linux/uvcvideo.h | 13 + include/uapi/linux/v4l2-controls.h | 7 + include/uapi/linux/videodev2.h | 5 + 18 files changed, 1058 insertions(+), 287 deletions(-) --- base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b change-id: 20241113-uvc-roi-66bd6cfa1e64 Best regards,