uvcvideo: Add support for UVC1.5 P&C control.
Subsystems (3)
PATCH 1/1 uvcvideo: Add support for UVC1.5 P&C control.
From: Pawel Osciak <[email protected]>
Add support for UVC 1.5 Probe & Commit control.
Signed-off-by Pawel Osciak <[email protected]>
Signed-off-by James Hilliard <[email protected]>
--- drivers/media/usb/uvc/uvc_video.c | 34 +++++++++++++++++++++++++++++++ include/uapi/linux/usb/video.h | 7 +++++++ 2 files changed, 41 insertions(+)
drivers/media/usb/uvc/uvc_video.c +34 -0
@@ -253,6 +253,7 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,u16 size =uvc_video_ctrl_size (stream);u8 *data;int ret; +unsigned int i;if ((stream->dev->quirks &UVC_QUIRK_PROBE_DEF ) && query ==UVC_GET_DEF )
@@ -322,6 +323,26 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream, ctrl->bMaxVersion =0 ; } +if (size >=48 ) { + ctrl->bUsage = data[34 ]; + ctrl->bBitDepthLuma = data[35 ]; + ctrl->bmSetting = data[36 ]; + ctrl->bMaxNumberOfRefFramesPlus1 = data[37 ]; + ctrl->bmRateControlModes =get_unaligned_le16 (&data[38 ]); +for (i =0 ; i <ARRAY_SIZE (ctrl->bmLayoutPerStream); ++i) { + ctrl->bmLayoutPerStream[i] = +get_unaligned_le16 (&data[40 + i *2 ]); + } + }else { + ctrl->bUsage =0 ; + ctrl->bBitDepthLuma =0 ; + ctrl->bmSetting =0 ; + ctrl->bMaxNumberOfRefFramesPlus1 =0 ; + ctrl->bmRateControlModes =0 ; +for (i =0 ; i <ARRAY_SIZE (ctrl->bmLayoutPerStream); ++i) + ctrl->bmLayoutPerStream[i] =0 ; + } +/* Some broken devices return null or wrong dwMaxVideoFrameSize and * dwMaxPayloadTransferSize fields. Try to get the value from the * format and frame descriptors.
@@ -340,6 +361,7 @@ static int uvc_set_video_ctrl(struct uvc_streaming *stream,u16 size =uvc_video_ctrl_size (stream);u8 *data;int ret; +unsigned int i; data =kzalloc (size,GFP_KERNEL );if (data ==NULL )
@@ -365,6 +387,18 @@ static int uvc_set_video_ctrl(struct uvc_streaming *stream, data[33 ] = ctrl->bMaxVersion; } +if (size >=48 ) { + data[34 ] = ctrl->bUsage; + data[35 ] = ctrl->bBitDepthLuma; + data[36 ] = ctrl->bmSetting; + data[37 ] = ctrl->bMaxNumberOfRefFramesPlus1; + *(__le16 *)&data[38 ] =cpu_to_le16 (ctrl->bmRateControlModes); +for (i =0 ; i <ARRAY_SIZE (ctrl->bmLayoutPerStream); ++i) { + *(__le16 *)&data[40 + i *2 ] = +cpu_to_le16 (ctrl->bmLayoutPerStream[i]); + } + } + ret =__uvc_query_ctrl (stream->dev,UVC_SET_CUR ,0 , stream->intfnum, probe ?UVC_VS_PROBE_CONTROL :UVC_VS_COMMIT_CONTROL , data, size, uvc_timeout_param);
include/uapi/linux/usb/video.h +7 -0
@@ -435,6 +435,7 @@ struct uvc_color_matching_descriptor {#define UVC_DT_COLOR_MATCHING_SIZE 6/* 4.3.1.1. Video Probe and Commit Controls */ +#define UVC_NUM_SIMULCAST_STREAMS 4struct uvc_streaming_control {__u16 bmHint;__u8 bFormatIndex;
@@ -452,6 +453,12 @@ struct uvc_streaming_control {__u8 bPreferedVersion;__u8 bMinVersion;__u8 bMaxVersion; +__u8 bUsage; +__u8 bBitDepthLuma; +__u8 bmSetting; +__u8 bMaxNumberOfRefFramesPlus1; +__u16 bmRateControlModes; +__u16 bmLayoutPerStream[UVC_NUM_SIMULCAST_STREAMS ]; } __attribute__((__packed__));/* Uncompressed Payload - 3.1.1. Uncompressed Video Format Descriptor */
Signature · 1 line
2.25.1