diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 913a9c705..01b0d601e 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.80 2005/12/10 17:51:31 rmcc Exp $ + $Id: bttv-driver.c,v 1.81 2005/12/14 22:05:02 hverkuil Exp $ bttv - Bt848 frame grabber driver @@ -224,6 +224,10 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x20, .vbipack = 255, .sram = 0, + /* ITU-R frame line number of the first VBI line + we can capture, of the first and second field. */ + .vbistart[0] = 7, + .vbistart[1] = 320, },{ .v4l2_id = V4L2_STD_NTSC_M, .name = "NTSC", @@ -240,6 +244,8 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x1a, .vbipack = 144, .sram = 1, + .vbistart[0] = 10, + .vbistart[1] = 273, },{ .v4l2_id = V4L2_STD_SECAM, .name = "SECAM", @@ -256,6 +262,8 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x20, .vbipack = 255, .sram = 0, /* like PAL, correct? */ + .vbistart[0] = 7, + .vbistart[1] = 320, },{ .v4l2_id = V4L2_STD_PAL_Nc, .name = "PAL-Nc", @@ -272,6 +280,8 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x1a, .vbipack = 144, .sram = -1, + .vbistart[0] = 7, + .vbistart[1] = 320, },{ .v4l2_id = V4L2_STD_PAL_M, .name = "PAL-M", @@ -288,6 +298,8 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x1a, .vbipack = 144, .sram = -1, + .vbistart[0] = 10, + .vbistart[1] = 273, },{ .v4l2_id = V4L2_STD_PAL_N, .name = "PAL-N", @@ -304,6 +316,8 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x20, .vbipack = 144, .sram = -1, + .vbistart[0] = 7, + .vbistart[1] = 320, },{ .v4l2_id = V4L2_STD_NTSC_M_JP, .name = "NTSC-JP", @@ -320,6 +334,8 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x16, .vbipack = 144, .sram = -1, + .vbistart[0] = 10, + .vbistart[1] = 273, },{ /* that one hopefully works with the strange timing * which video recorders produce when playing a NTSC @@ -340,6 +356,8 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vbipack = 255, .vtotal = 524, .sram = -1, + .vbistart[0] = 10, + .vbistart[1] = 273, } }; static const unsigned int BTTV_TVNORMS = ARRAY_SIZE(bttv_tvnorms); @@ -2596,10 +2614,10 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, fmt->count[0] = fmt2.fmt.vbi.count[0]; fmt->start[1] = fmt2.fmt.vbi.start[1]; fmt->count[1] = fmt2.fmt.vbi.count[1]; - if (fmt2.fmt.vbi.flags & VBI_UNSYNC) - fmt->flags |= V4L2_VBI_UNSYNC; - if (fmt2.fmt.vbi.flags & VBI_INTERLACED) - fmt->flags |= V4L2_VBI_INTERLACED; + if (fmt2.fmt.vbi.flags & V4L2_VBI_UNSYNC) + fmt->flags |= VBI_UNSYNC; + if (fmt2.fmt.vbi.flags & V4L2_VBI_INTERLACED) + fmt->flags |= VBI_INTERLACED; return 0; } case VIDIOCSVBIFMT: |