diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-01-09 15:21:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 15:21:36 -0500 |
commit | d312a46e5340be6a89c662ac483230c0737148c9 (patch) | |
tree | 4d458407ce0baaf613360c4b0866e9f96b5d5df3 /drivers/media/video/msp3400.h | |
parent | 1157020d542684e273242663d0befb58e284ade7 (diff) |
V4L/DVB (3324): msp3400 audio handling bug fixes.
- Check capabilities for audio settings (volume, balance,
bass, treble, loudness, mute)
- added loudness support
- added missing VIDEO_AUDIO_BALANCE flags for v4l1 compatibility
- do not call msp_any_detect_stereo for non-autoselect chips to
retrieve the current stereo setting: that will temporarily mute
the sound. It is only needed when the stereo mode might be
changed, and for autoselect msp processors that do not periodically
need to update their stereo setting.
- do not wake up the thread if the standard did not change. Prevents
temporary audio drop-out if the standard is set to the same value.
- fix confused stereo detect code where V4L2_TUNER_SUB_STEREO and
V4L2_TUNER_MODE_STEREO values were used incorrectly.
- stereo mode reporting was broken (v4l2 value used to index a
string array expecting v4l1 mode values).
- do not set dsp register 0x30 in the 3410d thread: that register
does not exist for pre-'G' revision msp chips.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/msp3400.h')
-rw-r--r-- | drivers/media/video/msp3400.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/msp3400.h b/drivers/media/video/msp3400.h index 70327506f895..fb44eef5d513 100644 --- a/drivers/media/video/msp3400.h +++ b/drivers/media/video/msp3400.h | |||
@@ -63,6 +63,7 @@ struct msp_state { | |||
63 | int has_ntsc_jp_d_k3; | 63 | int has_ntsc_jp_d_k3; |
64 | int has_scart4; | 64 | int has_scart4; |
65 | int has_scart23_in_scart2_out; | 65 | int has_scart23_in_scart2_out; |
66 | int has_scart2_out_volume; | ||
66 | int has_subwoofer; | 67 | int has_subwoofer; |
67 | int has_sound_processing; | 68 | int has_sound_processing; |
68 | int has_virtual_dolby_surround; | 69 | int has_virtual_dolby_surround; |
@@ -72,7 +73,6 @@ struct msp_state { | |||
72 | int opmode; | 73 | int opmode; |
73 | int mode; | 74 | int mode; |
74 | v4l2_std_id std; | 75 | v4l2_std_id std; |
75 | int stereo; | ||
76 | int nicam_on; | 76 | int nicam_on; |
77 | int acb; | 77 | int acb; |
78 | int in_scart; | 78 | int in_scart; |
@@ -85,8 +85,8 @@ struct msp_state { | |||
85 | int audmode; | 85 | int audmode; |
86 | int rxsubchans; | 86 | int rxsubchans; |
87 | 87 | ||
88 | int muted; | 88 | int volume, muted; |
89 | int volume, balance; | 89 | int balance, loudness; |
90 | int bass, treble; | 90 | int bass, treble; |
91 | 91 | ||
92 | /* thread */ | 92 | /* thread */ |