media: v4l2: map UVC_CT_ROLL_ABSOLUTE_CONTROL
Subsystems (2)
cover media: v4l2: map UVC_CT_ROLL_ABSOLUTE_CONTROL
Hi,
Some new UVC cameras can report whether they are mounted in 'portrait mode'.
In order to userspace getting to know this, this series maps UVC_CT_ROLL_ABSOLUTE_CONTROL to V4L2_CID_ROLL_ABSOLUTE.
Tested with Logitech StreamCam and OBSBOT Tiny 2.
Gergo Koteles (2):
media: v4l2: ctrls: Add ROLL_ABSOLUTE control
media: v4l2: map UVC_CT_ROLL_ABSOLUTE_CONTROL
.../userspace-api/media/v4l/ext-ctrls-camera.rst | 5 +++++ drivers/media/usb/uvc/uvc_ctrl.c | 9 +++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 + include/uapi/linux/v4l2-controls.h | 2 ++ 4 files changed, 17 insertions(+)
Signature · 1 line
2.45.2
PATCH 1/2 media: v4l2: ctrls: Add ROLL_ABSOLUTE control
Add V4L2_CID_ROLL_ABSOLUTE as an integer control to retrieve and set the camera roll in degrees, and its documentation.
--- Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst | 5 +++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 + include/uapi/linux/v4l2-controls.h | 2 ++ 3 files changed, 8 insertions(+)
Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst +5 -0
@@ -672,3 +672,8 @@ enum v4l2_scene_mode - As modes differ for each sensor, menu items are not standardized by this control and are left to the programmer. + +``V4L2_CID_ROLL_ABSOLUTE (integer)`` + This control describes the camera rotation along the image viewing axis in + degrees. Values range from -180 to +180, the default is zero. Positive + values rotate the camera clockwise, negative values counter-clockwise.
drivers/media/v4l2-core/v4l2-ctrls-defs.c +1 -0
@@ -1086,6 +1086,7 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_CAMERA_ORIENTATION :return "Camera Orientation" ;case V4L2_CID_CAMERA_SENSOR_ROTATION :return "Camera Sensor Rotation" ;case V4L2_CID_HDR_SENSOR_MODE :return "HDR Sensor Mode" ; +case V4L2_CID_ROLL_ABSOLUTE :return "Roll, Absolute" ;/* FM Radio Modulator controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */
include/uapi/linux/v4l2-controls.h +2 -0
@@ -1087,6 +1087,8 @@ enum v4l2_auto_focus_range {#define V4L2_CID_HDR_SENSOR_MODE (V4L2_CID_CAMERA_CLASS_BASE+36) +#define V4L2_CID_ROLL_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+37) +/* FM Modulator class control IDs */ #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900)
Signature · 1 line
2.45.2
PATCH 2/2 media: v4l2: map UVC_CT_ROLL_ABSOLUTE_CONTROL
In reply to Gergo KotelesSome new UVC cameras can report whether they are mounted in 'portrait mode'.
Current roll degrees (-90, 0, 90, 180) are reported with UVC_CT_ROLL_ABSOLUTE_CONTROL.
Map UVC_CT_ROLL_ABSOLUTE_CONTROL to V4L2_CID_ROLL_ABSOLUTE to make it available to userspace.
--- drivers/media/usb/uvc/uvc_ctrl.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/usb/uvc/uvc_ctrl.c +9 -0
@@ -748,6 +748,15 @@ 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_ROLL_ABSOLUTE, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_ROLL_ABSOLUTE_CONTROL, + .size = 16, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_INTEGER, + .data_type = UVC_CTRL_DATA_TYPE_SIGNED, + }, };const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited = {
Signature · 1 line
2.45.2
Laurent Pinchart
maintainerQuoted 5 lines · Gergo Koteles
Some new UVC cameras can report whether they are mounted in 'portrait mode'.
Current roll degrees (-90, 0, 90, 180) are reported with
UVC_CT_ROLL_ABSOLUTE_CONTROL.
UVC_CT_ROLL_ABSOLUTE_CONTROL is about controlling the motion of the camera along the roll axis, while this patch series sounds like you want to support reporting the mounting orientation of the device, not cause the device to rotate. Is that right ?
If that's the case, the right V4L2 control to use would be V4L2_CID_CAMERA_SENSOR_ROTATION. Mapping it to UVC_CT_ROLL_ABSOLUTE_CONTROL is problematic though, as UVC_CT_ROLL_ABSOLUTE_CONTROL is not meant for this in the UVC spec. We would likely need a quirk to control how it gets used.
Quoted 28 lines
Map
UVC_CT_ROLL_ABSOLUTE_CONTROLtoV4L2_CID_ROLL_ABSOLUTEto make it available to userspace.Signed-off-by Gergo Koteles <[email protected]>--- drivers/media/usb/uvc/uvc_ctrl.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/media/usb/uvc/uvc_ctrl.c +9
-0@@ -748,6 +748,15 @@ 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_ROLL_ABSOLUTE, + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_ROLL_ABSOLUTE_CONTROL, + .size = 16, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_INTEGER, + .data_type = UVC_CTRL_DATA_TYPE_SIGNED, + }, };const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited = {
Signature · 3 lines
Regards, Laurent Pinchart
Hi Laurent,
Quoted 11 lines · Laurent Pinchart
Quoted 5 lines · Gergo Koteles
Some new UVC cameras can report whether they are mounted in 'portrait mode'.
Current roll degrees (-90, 0, 90, 180) are reported with
UVC_CT_ROLL_ABSOLUTE_CONTROL.
UVC_CT_ROLL_ABSOLUTE_CONTROLis about controlling the motion of the camera along the roll axis, while this patch series sounds like you want to support reporting the mounting orientation of the device, not cause the device to rotate. Is that right ?
The SET_CUR of UVC_CT_ROLL_ABSOLUTE_CONTROL is optional, so I think it's for reporting also.
The cameras I've tested before can't roll the sensor, they only report the angle/orientation.
Yes, I was thinking to support the mounting orientation report, however I tried a friend's DJI Osmo Pocket 3, which can roll the sensor in +- 30˚ with ROLL_ABSOLUTE UVC control. It can also be Panned/Tilted/Zoomed, very cool.
I think mapping UVC_CT_ROLL_ABSOLUTE_CONTROL to V4L2_CID_ROLL_ABSOLUTE would be useful. I can reword the commit message a bit if you'd like.
Quoted 7 lines
If that's the case, the right V4L2 control to use would be
V4L2_CID_CAMERA_SENSOR_ROTATION. Mapping it toUVC_CT_ROLL_ABSOLUTE_CONTROLis problematic though, asUVC_CT_ROLL_ABSOLUTE_CONTROLis not meant for this in the UVC spec. We would likely need a quirk to control how it gets used.
I can also create a quirk for the other two cameras to map UVC_CT_ROLL_ABSOLUTE_CONTROL to V4L2_CID_CAMERA_SENSOR_ROTATION.
Maybe it can be detected if CT_ROLL_ABSOLUTE_CONTROL doesn't have SET_CUR, default 0, step 90.
Quoted 1 line
Best regards,
Gergo