Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

V4L/DVB (11219): gspca - sq905: Optimize the resolution setting.

Browse Source 
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-Francois Moine 2009-03-26 05:03:13 -03:00 committed by Mauro Carvalho Chehab
parent f6b8332b5e
commit 67e4542558
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/video/gspca/sq905.c
View File

@ -82,8 +82,6 @@ MODULE_LICENSE("GPL");
struct sd { struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */ struct gspca_dev gspca_dev; /* !! must be the first item */
const struct v4l2_pix_format *cap_mode;
/* /*
* Driver stuff * Driver stuff
*/ */
@ -218,6 +216,7 @@ static void sq905_dostream(struct work_struct *work)
int header_read; /* true if we have already read the frame header. */ int header_read; /* true if we have already read the frame header. */
int discarding; /* true if we failed to get space for frame. */ int discarding; /* true if we failed to get space for frame. */
int packet_type; int packet_type;
int frame_sz;
int ret; int ret;
u8 *data; u8 *data;
u8 *buffer; u8 *buffer;
@ -229,6 +228,9 @@ static void sq905_dostream(struct work_struct *work)
goto quit_stream; goto quit_stream;
} }
frame_sz = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].sizeimage
+ FRAME_HEADER_LEN;
while (gspca_dev->present && gspca_dev->streaming) { while (gspca_dev->present && gspca_dev->streaming) {
/* Need a short delay to ensure streaming flag was set by /* Need a short delay to ensure streaming flag was set by
* gspca and to make sure gspca can grab the mutex. */ * gspca and to make sure gspca can grab the mutex. */
@ -237,7 +239,7 @@ static void sq905_dostream(struct work_struct *work)
/* request some data and then read it until we have /* request some data and then read it until we have
* a complete frame. */ * a complete frame. */
bytes_left = dev->cap_mode->sizeimage + FRAME_HEADER_LEN; bytes_left = frame_sz;
header_read = 0; header_read = 0;
discarding = 0; discarding = 0;
@ -367,21 +369,18 @@ static int sd_start(struct gspca_dev *gspca_dev)
struct sd *dev = (struct sd *) gspca_dev; struct sd *dev = (struct sd *) gspca_dev;
int ret; int ret;
/* Set capture mode based on selected resolution. */
dev->cap_mode = gspca_dev->cam.cam_mode;
/* "Open the shutter" and set size, to start capture */ /* "Open the shutter" and set size, to start capture */
switch (gspca_dev->width) { switch (gspca_dev->curr_mode) {
case 640: default:
/* case 2: */
PDEBUG(D_STREAM, "Start streaming at high resolution"); PDEBUG(D_STREAM, "Start streaming at high resolution");
dev->cap_mode += 2;
ret = sq905_command(&dev->gspca_dev, SQ905_CAPTURE_HIGH); ret = sq905_command(&dev->gspca_dev, SQ905_CAPTURE_HIGH);
break; break;
case 320: case 1:
PDEBUG(D_STREAM, "Start streaming at medium resolution"); PDEBUG(D_STREAM, "Start streaming at medium resolution");
dev->cap_mode++;
ret = sq905_command(&dev->gspca_dev, SQ905_CAPTURE_MED); ret = sq905_command(&dev->gspca_dev, SQ905_CAPTURE_MED);
break; break;
default: case 0:
PDEBUG(D_STREAM, "Start streaming at low resolution"); PDEBUG(D_STREAM, "Start streaming at low resolution");
ret = sq905_command(&dev->gspca_dev, SQ905_CAPTURE_LOW); ret = sq905_command(&dev->gspca_dev, SQ905_CAPTURE_LOW);
} }