Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 03:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] gspca - nw80x: Fix some image resolutions

Browse Source 
No 352x288 for Ds3303 and no 320x240 for Generic802.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-François Moine 2011-03-22 06:04:09 -03:00 committed by Mauro Carvalho Chehab
parent ee32ffbf8e
commit 152507144a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/video/gspca/nw80x.c
View File

@ -154,6 +154,10 @@ static const u8 webcam_chip[NWEBCAMS] = {
* nw801/802: 320x240, 640x480 * nw801/802: 320x240, 640x480
*/ */
static const struct v4l2_pix_format cif_mode[] = { static const struct v4l2_pix_format cif_mode[] = {
{320, 240, V4L2_PIX_FMT_JPGL, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 4 / 8,
.colorspace = V4L2_COLORSPACE_JPEG},
{352, 288, V4L2_PIX_FMT_JPGL, V4L2_FIELD_NONE, {352, 288, V4L2_PIX_FMT_JPGL, V4L2_FIELD_NONE,
.bytesperline = 352, .bytesperline = 352,
.sizeimage = 352 * 288 * 4 / 8, .sizeimage = 352 * 288 * 4 / 8,
@ -1782,12 +1786,18 @@ static int sd_config(struct gspca_dev *gspca_dev,
PDEBUG(D_PROBE, "Bridge nw80%d - type: %d", sd->bridge, sd->webcam); PDEBUG(D_PROBE, "Bridge nw80%d - type: %d", sd->bridge, sd->webcam);
if (sd->bridge == BRIDGE_NW800) { if (sd->bridge == BRIDGE_NW800) {
gspca_dev->cam.cam_mode = cif_mode; switch (sd->webcam) {
gspca_dev->cam.nmodes = ARRAY_SIZE(cif_mode); case DS3303u:
gspca_dev->cam.cam_mode = cif_mode; /* qvga */
break;
default:
gspca_dev->cam.cam_mode = &cif_mode[1]; /* cif */
break;
}
gspca_dev->cam.nmodes = 1;
} else { } else {
gspca_dev->cam.cam_mode = vga_mode; gspca_dev->cam.cam_mode = vga_mode;
switch (sd->webcam) { switch (sd->webcam) {
case Generic802:
case Kr651us: case Kr651us:
case Proscope: case Proscope:
case P35u: case P35u: