git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-vbi.c
diff --git
a/drivers/media/video/cx88/cx88-vbi.c
b/drivers/media/video/cx88/cx88-vbi.c
index
3c3806e
..
5379e23
100644
(file)
--- a/
drivers/media/video/cx88/cx88-vbi.c
+++ b/
drivers/media/video/cx88/cx88-vbi.c
@@
-28,14
+28,17
@@
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;
f->fmt.vbi.count[0] = VBI_LINE_COUNT;
f->fmt.vbi.count[1] = VBI_LINE_COUNT;
- if (dev->tvnorm->id & V4L2_STD_525_60) {
- /* ntsc */
+ switch (dev->tvnorm->id) {
+ case V4L2_STD_NTSC_M:
+ case V4L2_STD_NTSC_M_JP:
f->fmt.vbi.sampling_rate = 28636363;
f->fmt.vbi.start[0] = 10 -1;
f->fmt.vbi.start[1] = 273 -1;
f->fmt.vbi.sampling_rate = 28636363;
f->fmt.vbi.start[0] = 10 -1;
f->fmt.vbi.start[1] = 273 -1;
-
- } else if (V4L2_STD_625_50) {
- /* pal */
+ break;
+ case V4L2_STD_PAL_BG:
+ case V4L2_STD_PAL_DK:
+ case V4L2_STD_PAL_I:
+ case V4L2_STD_SECAM:
f->fmt.vbi.sampling_rate = 35468950;
f->fmt.vbi.start[0] = 7 -1;
f->fmt.vbi.start[1] = 319 -1;
f->fmt.vbi.sampling_rate = 35468950;
f->fmt.vbi.start[0] = 7 -1;
f->fmt.vbi.start[1] = 319 -1;