diff options
| author | Gerd Knorr <devnull@localhost> | 2004-05-07 09:00:34 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-05-07 09:00:34 +0000 |
| commit | 133924f0d0b13244d42187e76661f07965383078 (patch) | |
| tree | 83bc0047f919eaf03a86fc435beac8eea4cb1648 /linux/drivers/media/video/cx88/cx88-vbi.c | |
| parent | f42bc240e3f18da6d9814d1673ab8c3302666b08 (diff) | |
| download | mediapointer-dvb-s2-133924f0d0b13244d42187e76661f07965383078.tar.gz mediapointer-dvb-s2-133924f0d0b13244d42187e76661f07965383078.tar.bz2 | |
- fix and enable single field capture in cx88.
- mt2050 antenna selection, based on patch by Matthias Reichl.
- msp3400 cleanups by Perry Gilfillan.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-vbi.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c index 3b066a1fd..068955ec8 100644 --- a/linux/drivers/media/video/cx88/cx88-vbi.c +++ b/linux/drivers/media/video/cx88/cx88-vbi.c @@ -28,17 +28,14 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f) f->fmt.vbi.count[0] = VBI_LINE_COUNT; f->fmt.vbi.count[1] = VBI_LINE_COUNT; - switch (dev->tvnorm->id) { - case V4L2_STD_NTSC_M: - case V4L2_STD_NTSC_M_JP: + if (dev->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; - break; - case V4L2_STD_PAL_BG: - case V4L2_STD_PAL_DK: - case V4L2_STD_PAL_I: - case V4L2_STD_SECAM: + + } else if (V4L2_STD_625_50) { + /* pal */ f->fmt.vbi.sampling_rate = 35468950; f->fmt.vbi.start[0] = 7 -1; f->fmt.vbi.start[1] = 319 -1; |