diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-09 10:15:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-09 10:15:42 -0300 |
| commit | a3a9bd1f37aac1eac329c68dfe544ad560e53eb8 (patch) | |
| tree | 8630c8d250b13e8e8e2e0a200002c69eb2cf9a7c /linux | |
| parent | 8c83eb6353c5869cf95eebdc5f2820875b11da19 (diff) | |
| download | mediapointer-dvb-s2-a3a9bd1f37aac1eac329c68dfe544ad560e53eb8.tar.gz mediapointer-dvb-s2-a3a9bd1f37aac1eac329c68dfe544ad560e53eb8.tar.bz2 | |
Cx88 NTSC VBI fixes
From: Michael Schimek <mschimek@gmx.at>
Hi,
VBI (Closed Caption, CC) capturing never worked in NTSC mode with the
cx88 driver.
They were tested with libzvbi and a patched version of tvtime.
Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-vbi.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index b657894e8..9d7574ac2 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -717,7 +717,7 @@ static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) static unsigned int inline norm_vbipack(struct cx88_tvnorm *norm) { - return (norm->id & V4L2_STD_625_50) ? 511 : 288; + return (norm->id & V4L2_STD_625_50) ? 511 : 400; } int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height, diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c index 749187d69..5cd0ee9ce 100644 --- a/linux/drivers/media/video/cx88/cx88-vbi.c +++ b/linux/drivers/media/video/cx88/cx88-vbi.c @@ -35,8 +35,8 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f) if (dev->core->tvnorm->id & V4L2_STD_525_60) { /* ntsc */ f->fmt.vbi.sampling_rate = 28636363; - f->fmt.vbi.start[0] = 10 -1; - f->fmt.vbi.start[1] = 273 -1; + f->fmt.vbi.start[0] = 10; + f->fmt.vbi.start[1] = 273; } else if (dev->core->tvnorm->id & V4L2_STD_625_50) { /* pal */ diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 88fff918d..0c7986572 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -40,7 +40,7 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif -#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5) +#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6) #ifndef TRUE # define TRUE (1==1) |