diff options
| author | Mike Isely <isely@pobox.com> | 2007-04-29 14:27:30 -0500 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2007-04-29 14:27:30 -0500 |
| commit | e7e951a35230e610d3bebb4e00168ecf8bc47760 (patch) | |
| tree | 9acff433b2f76eba1bcf47af6dae6a25b4488904 /linux/drivers/media/video/cx25840/cx25840-core.c | |
| parent | 7bf5d2440102f97e3ac056b30f29c3eff34ed093 (diff) | |
| download | mediapointer-dvb-s2-e7e951a35230e610d3bebb4e00168ecf8bc47760.tar.gz mediapointer-dvb-s2-e7e951a35230e610d3bebb4e00168ecf8bc47760.tar.bz2 | |
Improve / fix support for PAL-60 in cx25840
From: Servaas Vandenberghe <vdb128@picaros.org>
This causes the cx25840 module to treat V4L2_STD_PAL_60 similar to
other 60Hz timings, and it fixes a wrongly-named variable (timings are
independant of color system).
Signed-off-by: Mike Isely <isely@pobox.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index c401c1ee7..9d40a2b95 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -566,7 +566,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) { struct v4l2_pix_format *pix; int HSC, VSC, Vsrc, Hsrc, filter, Vlines; - int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_NTSC); + int is_50Hz = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60); switch (fmt->type) { case V4L2_BUF_TYPE_VIDEO_CAPTURE: @@ -578,7 +578,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) Hsrc = (cx25840_read(client, 0x472) & 0x3f) << 4; Hsrc |= (cx25840_read(client, 0x471) & 0xf0) >> 4; - Vlines = pix->height + (is_pal ? 4 : 7); + Vlines = pix->height + (is_50Hz ? 4 : 7); if ((pix->width * 16 < Hsrc) || (Hsrc < pix->width) || (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) { |