summaryrefslogtreecommitdiff
authorchengshun.wang <chengshun.wang@amlogic.com>2013-05-21 05:44:47 (GMT)
committer kevin_wang <kevin.wang@amlogic.com>2013-06-04 08:47:07 (GMT)
commit5df6fd052692523ed2e53d7d2a26226b92eb4194 (patch)
treedc6fb2bdbfa56c6d01e00c6cf34f60a020211ffa
parent6fd082099ff85047bb12d448de47ef5080ccf3e0 (diff)
downloadaudio-5df6fd052692523ed2e53d7d2a26226b92eb4194.zip
audio-5df6fd052692523ed2e53d7d2a26226b92eb4194.tar.gz
audio-5df6fd052692523ed2e53d7d2a26226b92eb4194.tar.bz2
PD #73379:camera record video have no sound
when use camera ,input device choose AUDIO_DEVICE_IN_BACK_MIC; and avoid touch sound tisturb record
Diffstat
-rwxr-xr-xaudio_hw.c4
-rwxr-xr-xwm8960_mixer_paths.xml7
2 files changed, 8 insertions, 3 deletions
diff --git a/audio_hw.c b/audio_hw.c
index 85cbc37..1a94fa8 100755
--- a/audio_hw.c
+++ b/audio_hw.c
@@ -208,11 +208,11 @@ static void select_output_device(struct aml_audio_device *adev)
static void select_input_device(struct aml_audio_device *adev)
{
- int mic_in = adev->in_device & AUDIO_DEVICE_IN_BUILTIN_MIC;
+ int mic_in = adev->in_device & ( AUDIO_DEVICE_IN_BUILTIN_MIC | AUDIO_DEVICE_IN_BACK_MIC);
int headset_mic = adev->in_device & AUDIO_DEVICE_IN_WIRED_HEADSET;
LOGFUNC("~~~~ %s : in_device(%#x), mic_in(%#x), headset_mic(%#x)", __func__, adev->in_device, mic_in, headset_mic);
- reset_mixer_state(adev->ar);
+ //reset_mixer_state(adev->ar);
if (mic_in)
{
audio_route_apply_path(adev->ar, "main_mic");
diff --git a/wm8960_mixer_paths.xml b/wm8960_mixer_paths.xml
index f929211..657220e 100755
--- a/wm8960_mixer_paths.xml
+++ b/wm8960_mixer_paths.xml
@@ -25,7 +25,7 @@
<ctl name="Left Boost Mixer LINPUT3 Switch" value="0" />
<ctl name="Left Boost Mixer LINPUT2 Switch" value="1" />
<ctl name="Capture Switch" value="0" />
- <ctl name="Capture Volume" value="40" />
+ <ctl name="Capture Volume" value="53" />
<ctl name="ADC High Pass Filter Switch" value="1" />
<ctl name="Capture Volume ZC Switch" value="1" />
<ctl name="ADC Output Select" value="1" />
@@ -42,4 +42,9 @@
<ctl name="ADC Output Select" value="2" />
<ctl name="ADC PCM Capture Volume" value="2" />
</path>
+
+ <path name="hdmi">
+ <ctl name="Speaker Playback Volume" value="0" />
+ <ctl name="Headphone Playback Volume" value="0" />
+ </path>
</mixer>