media: uvcvideo: support multiple frame descriptors with the same dimensions

The Microsoft HoloLens Sensors device has two separate frame descriptors with the same dimensions, each with a single different frame interval:

VideoStreaming Interface Descriptor:
bLength 30
bDescriptorType 36
bDescriptorSubtype 5 (FRAME_UNCOMPRESSED)
bFrameIndex 1
bmCapabilities 0x00
Still image unsupported
wWidth 1280
wHeight 481
dwMinBitRate 147763200
dwMaxBitRate 147763200
dwMaxVideoFrameBufferSize 615680
dwDefaultFrameInterval 333333
bFrameIntervalType 1
dwFrameInterval( 0) 333333
VideoStreaming Interface Descriptor:
bLength 30
bDescriptorType 36
bDescriptorSubtype 5 (FRAME_UNCOMPRESSED)
bFrameIndex 2
bmCapabilities 0x00
Still image unsupported
wWidth 1280
wHeight 481
dwMinBitRate 443289600
dwMaxBitRate 443289600
dwMaxVideoFrameBufferSize 615680
dwDefaultFrameInterval 111111
bFrameIntervalType 1
dwFrameInterval( 0) 111111

Skip duplicate dimensions in enum_framesizes, let enum_frameintervals list the intervals from both frame descriptors. Change set_streamparm to switch to the correct frame index when changing the interval. This enables 90 fps capture on a Lenovo Explorer Windows Mixed Reality headset.

Signed-off-by Philipp Zabel <[email protected]>

---
 drivers/media/usb/uvc/uvc_v4l2.c | 66 +++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 16 deletions(-)

(quoted diff) +0 -0

b/drivers/media/usb/uvc/uvc_v4l2.c index 3e7e283a44a8..7d5bf8d56a99 100644

drivers/media/usb/uvc/uvc_v4l2.c +0 -0

 	if (parm->type != stream->type)
 		return -EINVAL;

@@ -396,9 +399,31 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming
 *stream, return -EBUSY;
 	}
 

drivers/media/usb/uvc/uvc_v4l2.c +18 -0

+		if (&format->frame[i] == stream->cur_frame)
+			continue;
+
+		if (format->frame[i].wWidth != stream->cur_frame->wWidth ||
+		    format->frame[i].wHeight != stream->cur_frame->wHeight)
+			continue;
+
+		tmp = uvc_try_frame_interval(&format->frame[i], interval);
+		d = abs((__s32)tmp - interval);
+		if (d >= maxd)
+			continue;
+
+		frame = &format->frame[i];
+		probe.bFrameIndex = frame->bFrameIndex;
+		probe.dwFrameInterval = tmp;
+		maxd = d;
+	}
 
 	/* Probe the device with the new settings. */
 	ret = uvc_probe_video(stream, &probe);

@@ -408,6 +433,7 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming
 *stream, }
 
 	stream->ctrl = probe;
+	stream->cur_frame = frame;
 	mutex_unlock(&stream->mutex);
 
 	/* Return the actual frame period. */

drivers/media/usb/uvc/uvc_v4l2.c +12 -2

 	/* Look for the given pixel format */
 	for (i = 0; i < stream->nformats; i++) {

@@ -1162,10 +1188,20 @@ static int uvc_ioctl_enum_framesizes(struct file
 *file, void *fh, if (format == NULL)
 		return -EINVAL;
 
-	if (fsize->index >= format->nframes)
+	/* Skip duplicate frame sizes */
+	for (i = 0, index = 0; i < format->nframes; i++) {
+		if (i && frame->wWidth == format->frame[i].wWidth &&
+		    frame->wHeight == format->frame[i].wHeight)
+			continue;
+		frame = &format->frame[i];
+		if (index == fsize->index)
+			break;
+		index++;
+	}
+
+	if (i == format->nframes)
 		return -EINVAL;
 
-	frame = &format->frame[fsize->index];
 	fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
 	fsize->discrete.width = frame->wWidth;
 	fsize->discrete.height = frame->wHeight;

drivers/media/usb/uvc/uvc_v4l2.c +7 -6

 	/* Look for the given pixel format and frame size */
 	for (i = 0; i < stream->nformats; i++) {

@@ -1191,30 +1227,28 @@ static int uvc_ioctl_enum_frameintervals(struct file
 *file, void *fh, if (format == NULL)
 		return -EINVAL;
 
+	index = fival->index;
 	for (i = 0; i < format->nframes; i++) {
 		if (format->frame[i].wWidth == fival->width &&
 		    format->frame[i].wHeight == fival->height) {
 			frame = &format->frame[i];
-			break;
+			nintervals = frame->bFrameIntervalType ?: 1;
+			if (index < nintervals)
+				break;
+			index -= nintervals;
 		}
 	}
-	if (frame == NULL)
+	if (i == format->nframes)
 		return -EINVAL;
 
 	if (frame->bFrameIntervalType) {
-		if (fival->index >= frame->bFrameIntervalType)
-			return -EINVAL;
-
 		fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
 		fival->discrete.numerator =
-			frame->dwFrameInterval[fival->index];
+			frame->dwFrameInterval[index];