diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-04 13:05:30 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-04 13:05:30 +0200 |
| commit | aaf607f3c971b0096b4082f6dbd1d888f8b15f26 (patch) | |
| tree | 135e8720489c7e7e0f46aea39af475129e504409 /linux/drivers/media/video/saa7115.c | |
| parent | 046cd15a6775f8a911dd372ee50a9faec4239d0b (diff) | |
| download | mediapointer-dvb-s2-aaf607f3c971b0096b4082f6dbd1d888f8b15f26.tar.gz mediapointer-dvb-s2-aaf607f3c971b0096b4082f6dbd1d888f8b15f26.tar.bz2 | |
ivtv: fix raw/sliced VBI mixup
From: Hans Verkuil <hverkuil@xs4all.nl>
The service_set field was used in saa7115 and cx25840 to determine
whether raw or sliced VBI was desired. This is incorrect since it is
perfectly valid to select sliced VBI with a service_set of 0.
Instead these drivers should checked on VIDIOC_S_FMT whether the type
field matches the raw or sliced VBI type.
Updated ivtv accordingly.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7115.c')
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 6b9df354b..02386e403 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -1058,7 +1058,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo for (i = 0; i <= 23; i++) lcr[i] = 0xff; - if (fmt->service_set == 0) { + if (fmt == NULL) { /* raw VBI */ if (is_50hz) for (i = 6; i <= 23; i++) @@ -1114,7 +1114,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo } /* enable/disable raw VBI capturing */ - saa711x_writeregs(client, fmt->service_set == 0 ? + saa711x_writeregs(client, fmt == NULL ? saa7115_cfg_vbi_on : saa7115_cfg_vbi_off); } @@ -1154,6 +1154,10 @@ static int saa711x_set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt saa711x_set_lcr(client, &fmt->fmt.sliced); return 0; } + if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE) { + saa711x_set_lcr(client, NULL); + return 0; + } if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; |