diff options
| author | Franco <frapeti@gmail.com> | 2015-02-14 22:45:13 -0300 |
|---|---|---|
| committer | Sergiu Cozma <lssjbrolli@gmail.com> | 2015-03-28 11:56:12 +0200 |
| commit | b0d3496045eefb5903210c60b235995ec3fa5eba (patch) | |
| tree | 64148c28ad743d9f8886d59accbf874d48d0b5c9 | |
| parent | cbe0a0db0a81c208d55a8433767e9562bd456b72 (diff) | |
audio: fix calls while voice recognition is enabled
this is a workaround for the "ok google" feature, echo in calls should still be here and this should be fixed properly
Change-Id: I0275ce564445f14721f65d4ccfaa6f3dec1279a6
Conflicts:
audio/mixer_paths.xml
| -rw-r--r-- | audio/audio_hw.c | 2 | ||||
| -rw-r--r-- | audio/mixer_paths.xml | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 4d0aef3..7d4b672 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -284,7 +284,7 @@ static int get_input_source_id(audio_source_t source) switch (source) { case AUDIO_SOURCE_DEFAULT: - return IN_SOURCE_NONE; + return IN_SOURCE_VOICE_CALL; case AUDIO_SOURCE_MIC: return IN_SOURCE_MIC; diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml index c1953c2..2a0ad3e 100644 --- a/audio/mixer_paths.xml +++ b/audio/mixer_paths.xml @@ -299,11 +299,20 @@ INPUT_CHANNEL_MAP { </path> <path name="media-speaker"> - <path name="speaker" /> + <path name="speaker" /> + <ctl name="AIF2 Mode" value="Slave" /> + <ctl name="SPKOUTL Input 3" value="ASRC2L" /> + <ctl name="Speaker Digital Volume" value="144" /> + <ctl name="SPKOUTL Input 1 Volume" value="10" /> + <ctl name="SPKOUTL Input 2 Volume" value="10" /> + <ctl name="SPKOUTL Input 3 Volume" value="32" /> + <ctl name="SPKOUTL Input 4 Volume" value="32" /> </path> <path name="media-earpiece"> - <path name="earpiece" /> + <path name="earpiece" /> + <ctl name="AIF2 Mode" value="Slave" /> + <ctl name="EPOUT Input 3" value="ASRC2L" /> </path> <path name="media-headphones"> |