]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
V4L/DVB (13309): uvcvideo: Ignore the FIX_BANDWIDTH for compressed video
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Wed, 4 Nov 2009 14:09:12 +0000 (11:09 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Nov 2009 14:55:14 +0000 (12:55 -0200)
The FIX_BANDWIDTH quirk tries to work around cameras requesting the
maximum bandwidth regardless of the image size by computing a bandwidth
estimate. This works only for uncompressed frames.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/uvc/uvc_video.c

index f960e8ea4f17e3d632547c5b1551d406cf54f736..a6e41d12b22174f7a322ae1bb76abe66ebf8cb50 100644 (file)
@@ -90,7 +90,8 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream,
                ctrl->dwMaxVideoFrameSize =
                        frame->dwMaxVideoFrameBufferSize;
 
-       if (stream->dev->quirks & UVC_QUIRK_FIX_BANDWIDTH &&
+       if (!(format->flags & UVC_FMT_FLAG_COMPRESSED) &&
+           stream->dev->quirks & UVC_QUIRK_FIX_BANDWIDTH &&
            stream->intf->num_altsetting > 1) {
                u32 interval;
                u32 bandwidth;