aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemAllocator <omerkisoss@gmail.com>2015-02-20 17:18:07 -0300
committerSergiu Cozma <lssjbrolli@gmail.com>2015-03-28 11:59:24 +0200
commitd16af2df6a8479307bc6a3c3f9667fc41785b996 (patch)
tree893bc98ce6b36b9037d1eea81acfab5866c4e5a5
parentfad79e1a30efcffd8615846f9a2193d3afa0255d (diff)
audio: reduce background noise in calls
Change-Id: I3e92e5e99d1a4dc2728325aa17dc17e6f1a942d7
-rw-r--r--audio/mixer_paths.xml28
-rw-r--r--audio/routing.h4
2 files changed, 24 insertions, 8 deletions
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index 2e21e63..18b4af7 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -247,8 +247,7 @@ INPUT_CHANNEL_MAP {
<ctl name="Main Mic Switch" value="1" />
<ctl name="LHPF1 Input 1" value="IN1L" />
<ctl name="IN1L Volume" value="18" />
- <ctl name="AIF2TX1 Input 1" value="ASRC1L" />
- <ctl name="AIF2TX2 Input 1" value="ASRC1R" />
+ <ctl name="LHPF1 Input 1 Volume" value="32" />
<ctl name="IN1L Digital Volume" value="128" />
</path>
@@ -256,8 +255,7 @@ INPUT_CHANNEL_MAP {
<ctl name="Sub Mic Switch" value="1" />
<ctl name="LHPF2 Input 1" value="IN2L" />
<ctl name="IN2L Volume" value="17" />
- <ctl name="AIF2TX1 Input 1" value="ASRC1L" />
- <ctl name="AIF2TX2 Input 1" value="ASRC1R" />
+ <ctl name="LHPF2 Input 1 Volume" value="32" />
<ctl name="IN2L Digital Volume" value="128" />
</path>
@@ -265,8 +263,7 @@ INPUT_CHANNEL_MAP {
<ctl name="3rd Mic Switch" value="1" />
<ctl name="LHPF1 Input 1" value="IN2R" />
<ctl name="IN2R Volume" value="20" />
- <ctl name="AIF2TX1 Input 1" value="ASRC1L" />
- <ctl name="AIF2TX2 Input 1" value="ASRC1R" />
+ <ctl name="LHPF1 Input 1 Volume" value="32" />
<ctl name="IN2R Digital Volume" value="128" />
</path>
@@ -405,11 +402,30 @@ INPUT_CHANNEL_MAP {
<!-- Capture paths -->
<path name="voice-main-mic">
+ <path name="channel-stereo" />
+ <path name="aif2-stereo-mic" />
<path name="builtin-mic" />
+ <path name="back-mic" />
+ <ctl name="IN2L Volume" value="25" />
+ <ctl name="IN2R Volume" value="23" />
</path>
<path name="voice-main-mic-wb">
+ <path name="channel-stereo" />
+ <path name="aif2-stereo-mic" />
<path name="builtin-mic" />
+ <path name="back-mic" />
+ <ctl name="IN2L Volume" value="25" />
+ <ctl name="IN2R Volume" value="23" />
+ </path>
+
+ <path name="voice-speaker-main-mic">
+ <path name="channel-stereo" />
+ <path name="aif2-stereo-mic" />
+ <path name="back-mic" />
+ <path name="third-mic" />
+ <ctl name="IN2L Volume" value="23" />
+ <ctl name="IN2R Volume" value="23" />
</path>
<path name="voice-headset-mic">
diff --git a/audio/routing.h b/audio/routing.h
index 4fccc0d..ffb68b0 100644
--- a/audio/routing.h
+++ b/audio/routing.h
@@ -60,14 +60,14 @@ struct route_config {
/* TODO: Figure out whether voice routes need to set ES325 presets */
const struct route_config voice_speaker = {
"voice-speaker",
- "voice-main-mic",
+ "voice-speaker-main-mic",
{ ES325_PRESET_OFF,
ES325_PRESET_OFF }
};
const struct route_config voice_speaker_wb = {
"voice-speaker-wb",
- "voice-main-mic-wb",
+ "voice-speaker-main-mic",
{ ES325_PRESET_OFF,
ES325_PRESET_OFF }
};