diff options
| author | Andy Walls <awalls@radix.net> | 2009-02-06 23:15:44 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2009-02-06 23:15:44 -0500 |
| commit | 7784b73d36b6f96ba397937b9246610fea511e09 (patch) | |
| tree | a3e78470ebc20ffd0da35f3e908a5d1778e8bc23 /linux/drivers/media/video/cx18 | |
| parent | 66588fb3c835b7f534deb67c863970dcfbccea30 (diff) | |
| download | mediapointer-dvb-s2-7784b73d36b6f96ba397937b9246610fea511e09.tar.gz mediapointer-dvb-s2-7784b73d36b6f96ba397937b9246610fea511e09.tar.bz2 | |
cx18: Use correct line counts per field in firmware API call
From: Andy Walls <awalls@radix.net>
The driver was incorrectly setting 0 line counts in a firmware
API call to set the maximum amount of lines per field.
Priority: normal
Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.h | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-streams.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h index 0ef099186..20189283a 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.h +++ b/linux/drivers/media/video/cx18/cx18-driver.h @@ -479,9 +479,6 @@ struct cx18 { unsigned long dualwatch_jiffies; u32 dualwatch_stereo_mode; - /* Digitizer type */ - int digitizer; /* 0x00EF = saa7114 0x00FO = saa7115 0x0106 = mic */ - struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ struct cx18_options options; /* User options */ int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */ diff --git a/linux/drivers/media/video/cx18/cx18-streams.c b/linux/drivers/media/video/cx18/cx18-streams.c index f2b6a1410..cec4794bf 100644 --- a/linux/drivers/media/video/cx18/cx18-streams.c +++ b/linux/drivers/media/video/cx18/cx18-streams.c @@ -548,10 +548,11 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s) /* * Number of lines for Field 1 & Field 2 according to * Documentation/video4linux/cx2341x/fw-encoder-api.txt - * FIXME - currently we set this to 0 & 0 but things seem OK + * Field 1 is 312 for 625 line systems in BT.656 + * Field 2 is 313 for 625 line systems in BT.656 */ cx18_vapi(cx, CX18_CPU_SET_CAPTURE_LINE_NO, 3, - s->handle, cx->digitizer, cx->digitizer); + s->handle, 312, 313); if (cx->v4l2_cap & V4L2_CAP_VBI_CAPTURE) cx18_vbi_setup(s); |