lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (4001): Cx88 NTSC VBI fixes

Browse Source 
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>
This commit is contained in:
Michael Schimek
2006-05-22 10:32:11 -03:00
committed by Mauro Carvalho Chehab
parent 7f2c8a9c53
commit 419ac5d466
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/cx88/cx88-core.c
View File

@@ -677,7 +677,7 @@ static unsigned int inline norm_htotal(struct cx88_tvnorm *norm)
static unsigned int inline norm_vbipack(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, int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height,

4
drivers/media/video/cx88/cx88-vbi.c
View File

@@ -34,8 +34,8 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
if (dev->core->tvnorm->id & V4L2_STD_525_60) { if (dev->core->tvnorm->id & V4L2_STD_525_60) {
/* ntsc */ /* ntsc */
f->fmt.vbi.sampling_rate = 28636363; f->fmt.vbi.sampling_rate = 28636363;
f->fmt.vbi.start[0] = 10 -1; f->fmt.vbi.start[0] = 10;
f->fmt.vbi.start[1] = 273 -1; f->fmt.vbi.start[1] = 273;
} else if (dev->core->tvnorm->id & V4L2_STD_625_50) { } else if (dev->core->tvnorm->id & V4L2_STD_625_50) {
/* pal */ /* pal */

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

@@ -35,7 +35,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5) #define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)
#ifndef TRUE #ifndef TRUE
# define TRUE (1==1) # define TRUE (1==1)