diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-30 17:52:33 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-30 17:52:33 +0000 |
| commit | dd2ac1c45dacc0ace8b20091fd156ede662878fe (patch) | |
| tree | 507f91ad7e640d39c3faf641b240213ce601de81 /linux/drivers/media/video/cx88/cx88-core.c | |
| parent | e45b15bf72002c473a0e621ff96b0787a8d5267b (diff) | |
| download | mediapointer-dvb-s2-dd2ac1c45dacc0ace8b20091fd156ede662878fe.tar.gz mediapointer-dvb-s2-dd2ac1c45dacc0ace8b20091fd156ede662878fe.tar.bz2 | |
* cx88-core.c: (set_tvaudio):
* cx88-tvaudio.c: (set_audio_standard_NICAM),
(set_audio_standard_A2), (set_audio_standard_FM),
(cx88_detect_nicam), (cx88_set_tvaudio), (cx88_newstation),
(cx88_set_stereo):
* cx88.h:
- Added nicam autodetection for PAL B/G/D/K/I/L.
If it fails then falls back to fm / am mono audio.
- Added debug messages about detecting state.
- 'set_audio_standard_NICAM_L' and 'set_audio_standard_PAL_I'
moved to 'set_audio_standard_A2' and 'set_audio_standard_NICAM'
for cleaner code.
- Changed some WW_xx values for better handling.
- Added 'use_nicam' to 'core' to save nicam detecting state for
later use in 'cx88_set_stereo'.
- Not working:
- Auto fall back to fm / am mono if transmitting quality goes bad.
- A2 dual fm stereo auto detecting.
Signed-off-by: Torsten Seeboth <Torsten.Seeboth@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 4d7e1fed7..47346de46 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.37 2005/08/16 16:29:52 catalin Exp $ + * $Id: cx88-core.c,v 1.38 2005/08/30 17:52:33 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -878,19 +878,19 @@ static int set_tvaudio(struct cx88_core *core) return 0; if (V4L2_STD_PAL_BG & norm->id) { - core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_BG; + core->tvaudio = WW_BG; } else if (V4L2_STD_PAL_DK & norm->id) { - core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_DK; + core->tvaudio = WW_DK; } else if (V4L2_STD_PAL_I & norm->id) { - core->tvaudio = WW_NICAM_I; + core->tvaudio = WW_I; } else if (V4L2_STD_SECAM_L & norm->id) { - core->tvaudio = WW_SYSTEM_L_AM; + core->tvaudio = WW_L; } else if (V4L2_STD_SECAM_DK & norm->id) { - core->tvaudio = WW_A2_DK; + core->tvaudio = WW_DK; } else if ((V4L2_STD_NTSC_M & norm->id) || (V4L2_STD_PAL_M & norm->id)) { |