| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <779a1a39-64f9-4985-b733-92f8673f3d3e@kernel.org>
Date: Mon, 8 Dec 2025 12:02:06 +0100
From: Hans de Goede <hansg@...nel.org>
To: Ricardo Ribalda <ribalda@...omium.org>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-usb@...r.kernel.org, Manav Gautama <bandwidthcrunch@...il.com>,
Martin Rubli <martin_rubli@...itech.com>
Subject: Re: [PATCH v2 2/6] media: uvcvideo: Import standard controls from
uvcdynctrl
Hi Ricardo,
Thank you very much for doing this, this has been on my own TODO list for
a long time, so it is great to finally see this happen.
On 19-Nov-25 8:37 PM, Ricardo Ribalda wrote:
> The uvcdynctrl tool from libwebcam:
> https://sourceforge.net/projects/libwebcam/
> maps proprietary controls into v4l2 controls using the UVCIOC_CTRL_MAP
> ioctl.
>
> The tool has not been updated for 10+ years now, and there is no reason
> for the UVC driver to not do the mapping by itself.
>
> This patch adds the mappings from the uvcdynctrl into the driver. Hopefully
> this effort can help in deprecating the UVCIOC_CTRL_MAP ioctl.
...
Question what happens if uvcdynctrl is run after applying this patch ?
We already have the ctrl-info + mappings now, does the code detect this
and ignore the duplicate info, or ... ?
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 2905505c240c060e5034ea12d33b59d5702f2e1f..57ce486f22bbc404a1f127539eb2d12373431631 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -385,6 +385,99 @@ static const struct uvc_control_info uvc_ctrls[] = {
> | UVC_CTRL_FLAG_GET_RANGE
> | UVC_CTRL_FLAG_RESTORE,
> },
> + /*
> + * Allows the control of pan/tilt motor movements for camera models
> + * that support mechanical pan/tilt.
> + *
> + * Bits 0 to 15 control pan, bits 16 to 31 control tilt.
> + * The unit of the pan/tilt values is 1/64th of a degree and the
> + * resolution is 1 degree.
> + */
> + {
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 1,
> + .index = 0,
> + .size = 4,
> + .flags = UVC_CTRL_FLAG_GET_DEF
> + | UVC_CTRL_FLAG_GET_MAX
> + | UVC_CTRL_FLAG_GET_MIN
> + | UVC_CTRL_FLAG_SET_CUR,
> + },
> + /*
> + * Reset the pan/tilt motors to their original position for camera
> + * models that support mechanical pan/tilt.
> + *
> + * Setting bit 0 resets the pan position.
> + * Setting bit 1 resets the tilt position.
> + *
> + * Both bits can be set at the same time to reset both, pan and tilt,
> + * at the same time.
> + */
> + {
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 2,
> + .index = 1,
> + .size = 1,
> + .flags = UVC_CTRL_FLAG_GET_DEF
> + | UVC_CTRL_FLAG_GET_MAX
> + | UVC_CTRL_FLAG_GET_MIN
> + | UVC_CTRL_FLAG_SET_CUR,
> + },
> + /*
> + * Allows the control of focus motor movements for camera models that
> + * support mechanical focus.
> + *
> + * Bits 0 to 7 allow selection of the desired lens position.
> + * There are no physical units, instead, the focus range is spread over
> + * 256 logical units with 0 representing infinity focus and 255 being
> + * macro focus.
> + */
> + {
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 3,
> + .index = 2,
> + .size = 6,
> + .flags = UVC_CTRL_FLAG_GET_CUR
> + | UVC_CTRL_FLAG_GET_DEF
> + | UVC_CTRL_FLAG_GET_MAX
> + | UVC_CTRL_FLAG_GET_MIN
> + | UVC_CTRL_FLAG_SET_CUR,
> + },
> + /*
> + * Allows the control of pan/tilt motor movements for camera models
> + * that support mechanical pan/tilt.
> + *
> + * Bits 0 to 15 control pan, bits 16 to 31 control tilt.
> + */
> + {
> + .entity = UVC_GUID_LOGITECH_PERIPHERAL,
At a first read I thought this was duplicate with the pan/tilt motor
control mapping above but this is for UVC_GUID_LOGITECH_PERIPHERAL, where
as the ctrl_info above is for UVC_GUID_LOGITECH_MOTOR_CONTROL_V1 .
I wonder if this is worth a comment ? One difference here is is
the support of UVC_CTRL_FLAG_GET_RES .
> + .selector = 1,
> + .index = 0,
> + .size = 4,
> + .flags = UVC_CTRL_FLAG_GET_DEF
> + | UVC_CTRL_FLAG_GET_MAX
> + | UVC_CTRL_FLAG_GET_MIN
> + | UVC_CTRL_FLAG_GET_RES
> + | UVC_CTRL_FLAG_SET_CUR,
> + },
> + /*
> + * Reset the pan/tilt motors to their original position for camera
> + * models that support mechanical pan/tilt.
> + *
> + * Setting bit 0 resets the pan position.
> + * Setting bit 1 resets the tilt position.
> + */
> + {
> + .entity = UVC_GUID_LOGITECH_PERIPHERAL,
> + .selector = 2,
> + .index = 1,
> + .size = 1,
> + .flags = UVC_CTRL_FLAG_GET_DEF
> + | UVC_CTRL_FLAG_GET_MAX
> + | UVC_CTRL_FLAG_GET_MIN
> + | UVC_CTRL_FLAG_GET_RES
> + | UVC_CTRL_FLAG_SET_CUR,
> + },
> };
>
> static const u32 uvc_control_classes[] = {
> @@ -1009,6 +1102,87 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = {
> .menu_mask = BIT(V4L2_COLORFX_VIVID) |
> BIT(V4L2_COLORFX_NONE),
> },
> + {
> + .id = V4L2_CID_PAN_RELATIVE,
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 1,
> + .size = 16,
> + .offset = 0,
> + .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
> + .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
> + },
> + {
> + .id = V4L2_CID_TILT_RELATIVE,
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 1,
> + .size = 16,
> + .offset = 16,
> + .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
> + .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
> + },
> + {
> + .id = V4L2_CID_PAN_RESET,
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 2,
> + .size = 1,
> + .offset = 0,
> + .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
> + .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
> + },
> + {
> + .id = V4L2_CID_TILT_RESET,
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 2,
> + .size = 1,
> + .offset = 1,
> + .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
> + .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
> + },
> + {
> + .id = V4L2_CID_PAN_RELATIVE,
> + .entity = UVC_GUID_LOGITECH_PERIPHERAL,
> + .selector = 1,
> + .size = 16,
> + .offset = 0,
> + .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
> + .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
> + },
> + {
> + .id = V4L2_CID_TILT_RELATIVE,
> + .entity = UVC_GUID_LOGITECH_PERIPHERAL,
> + .selector = 1,
> + .size = 16,
> + .offset = 16,
> + .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
> + .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
> + },
> + {
> + .id = V4L2_CID_PAN_RESET,
> + .entity = UVC_GUID_LOGITECH_PERIPHERAL,
> + .selector = 2,
> + .size = 1,
> + .offset = 0,
> + .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
> + .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
> + },
> + {
> + .id = V4L2_CID_TILT_RESET,
> + .entity = UVC_GUID_LOGITECH_PERIPHERAL,
> + .selector = 2,
> + .size = 1,
> + .offset = 1,
> + .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
> + .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
> + },
> + {
> + .id = V4L2_CID_FOCUS_ABSOLUTE,
> + .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
> + .selector = 3,
> + .size = 8,
> + .offset = 0,
> + .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
> + .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
> + },
> };
>
> /* ------------------------------------------------------------------------
> diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h
> index 22e0dab0809e296e089940620ae0e8838e109701..b939a01da11466747249c64c72a3ea40cd364a59 100644
> --- a/include/linux/usb/uvc.h
> +++ b/include/linux/usb/uvc.h
> @@ -35,6 +35,12 @@
> #define UVC_GUID_MSXU_1_5 \
> {0xdc, 0x95, 0x3f, 0x0f, 0x32, 0x26, 0x4e, 0x4c, \
> 0x92, 0xc9, 0xa0, 0x47, 0x82, 0xf4, 0x3b, 0xc8}
> +#define UVC_GUID_LOGITECH_MOTOR_CONTROL_V1 \
> + {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \
> + 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x56 }
> +#define UVC_GUID_LOGITECH_PERIPHERAL \
> + {0x21, 0x2d, 0xe5, 0xff, 0x30, 0x80, 0x2c, 0x4e, \
> + 0x82, 0xd9, 0xf5, 0x87, 0xd0, 0x05, 0x40, 0xbd }
>
> /* https://learn.microsoft.com/en-us/windows-hardware/drivers/stream/uvc-extensions-1-5#222-extension-unit-controls */
> #define UVC_MSXU_CONTROL_FOCUS 0x01
>
Regards,
Hans
Powered by blists - more mailing lists