Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 01:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB: gspca - ov534: Allow enumerating supported framerates

Browse Source 
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antonio Ospite 2010-01-17 03:27:04 -03:00 committed by Mauro Carvalho Chehab
parent 4b27d07474
commit 29b87f0455
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/gspca/gspca.h
View File

@ -48,7 +48,7 @@ extern int gspca_debug;
/* used to list framerates supported by a camera mode (resolution) */
struct framerates {
int *rates;
const u8 *rates;
int nrates;
};

15
drivers/media/video/gspca/ov534.c
View File

@ -282,6 +282,20 @@ static const struct v4l2_pix_format ov772x_mode[] = {
.priv = 0},
};
static const u8 qvga_rates[] = {125, 100, 75, 60, 50, 40, 30};
static const u8 vga_rates[] = {60, 50, 40, 30, 15};
static const struct framerates ov772x_framerates[] = {
{ /* 320x240 */
.rates = qvga_rates,
.nrates = ARRAY_SIZE(qvga_rates),
},
{ /* 640x480 */
.rates = vga_rates,
.nrates = ARRAY_SIZE(vga_rates),
},
};
static const u8 bridge_init[][2] = {
{ 0xc2, 0x0c },
{ 0x88, 0xf8 },
@ -799,6 +813,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
cam->cam_mode = ov772x_mode;
cam->nmodes = ARRAY_SIZE(ov772x_mode);
cam->mode_framerates = ov772x_framerates;
cam->bulk = 1;
cam->bulk_size = 16384;