leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (9569): uvcvideo: Sort the frame descriptors during parsing

Browse Source 
The UVC specification does not require frame descriptors to be sorted by
bFrameIndex. At least one camera (145f:013e) is known not to sort the
descriptors properly, so they need to be sorted during parsing as the driver
then accesses them by index.

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2008-11-08 18:53:49 -03:00 committed by Mauro Carvalho Chehab
parent 2f38483bc4
commit c9535db3d2
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/video/uvc/uvc_driver.c
View File

@ -288,8 +288,10 @@ static int uvc_parse_format(struct uvc_device *dev,
struct uvc_format_desc *fmtdesc; struct uvc_format_desc *fmtdesc;
struct uvc_frame *frame; struct uvc_frame *frame;
const unsigned char *start = buffer; const unsigned char *start = buffer;
unsigned char *_buffer;
unsigned int interval; unsigned int interval;
unsigned int i, n; unsigned int i, n;
int _buflen;
__u8 ftype; __u8 ftype;
format->type = buffer[2]; format->type = buffer[2];
@ -410,12 +412,20 @@ static int uvc_parse_format(struct uvc_device *dev,
buflen -= buffer[0]; buflen -= buffer[0];
buffer += buffer[0]; buffer += buffer[0];
/* Count the number of frame descriptors to test the bFrameIndex
* field when parsing the descriptors. We can't rely on the
* bNumFrameDescriptors field as some cameras don't initialize it
* properly.
*/
for (_buflen = buflen, _buffer = buffer;
_buflen > 2 && _buffer[2] == ftype;
_buflen -= _buffer[0], _buffer += _buffer[0])
format->nframes++;
/* Parse the frame descriptors. Only uncompressed, MJPEG and frame /* Parse the frame descriptors. Only uncompressed, MJPEG and frame
* based formats have frame descriptors. * based formats have frame descriptors.
*/ */
while (buflen > 2 && buffer[2] == ftype) { while (buflen > 2 && buffer[2] == ftype) {
frame = &format->frame[format->nframes];
if (ftype != VS_FRAME_FRAME_BASED) if (ftype != VS_FRAME_FRAME_BASED)
n = buflen > 25 ? buffer[25] : 0; n = buflen > 25 ? buffer[25] : 0;
else else
@ -430,6 +440,16 @@ static int uvc_parse_format(struct uvc_device *dev,
return -EINVAL; return -EINVAL;
} }
if (buffer[3] - 1 >= format->nframes) {
uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming"
"interface %d frame index %u out of range\n",
dev->udev->devnum, alts->desc.bInterfaceNumber,
buffer[3]);
return -EINVAL;
}
frame = &format->frame[buffer[3] - 1];
frame->bFrameIndex = buffer[3]; frame->bFrameIndex = buffer[3];
frame->bmCapabilities = buffer[4]; frame->bmCapabilities = buffer[4];
frame->wWidth = le16_to_cpup((__le16 *)&buffer[5]); frame->wWidth = le16_to_cpup((__le16 *)&buffer[5]);
@ -486,7 +506,6 @@ static int uvc_parse_format(struct uvc_device *dev,
10000000/frame->dwDefaultFrameInterval, 10000000/frame->dwDefaultFrameInterval,
(100000000/frame->dwDefaultFrameInterval)%10); (100000000/frame->dwDefaultFrameInterval)%10);
format->nframes++;
buflen -= buffer[0]; buflen -= buffer[0];
buffer += buffer[0]; buffer += buffer[0];
} }