audio: voip downlink to stereo
Bug: 208951314
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I85c654319998e31bb846830f9878b9385ef30091
diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index b7f4265..0b204f6 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
<!-- for input -->
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -286,7 +286,7 @@
<external_module>
<module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
- <module libname="audio_fortemedia_aoc.so"/>
+ <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml
index 43e9034..a4fcad8 100644
--- a/audio/cheetah/config/mixer_paths.xml
+++ b/audio/cheetah/config/mixer_paths.xml
@@ -634,6 +634,10 @@
<ctl name="AMP PCM Gain" value="17"/>
</path>
+ <path name="voice-dual-speaker">
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Main AMP Enable Switch" value="1"/>
diff --git a/audio/cloudripper/config/audio_platform_configuration.xml b/audio/cloudripper/config/audio_platform_configuration.xml
index 0356bb9..8ef3573 100644
--- a/audio/cloudripper/config/audio_platform_configuration.xml
+++ b/audio/cloudripper/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
<!-- for input -->
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -282,7 +282,7 @@
<external_module>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
- <module libname="audio_fortemedia_aoc.so"/>
+ <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml
index 9fef955..2a1e039 100644
--- a/audio/cloudripper/config/mixer_paths.xml
+++ b/audio/cloudripper/config/mixer_paths.xml
@@ -640,6 +640,10 @@
<ctl name="R AMP Enable Switch" value="1"/>
</path>
+ <path name="voice-dual-speaker">
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe">
<ctl name="R AMP Enable Switch" value="1"/>
</path>
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index b7f4265..0b204f6 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
<!-- for input -->
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -286,7 +286,7 @@
<external_module>
<module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
- <module libname="audio_fortemedia_aoc.so"/>
+ <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml
index 43e9034..a4fcad8 100644
--- a/audio/panther/config/mixer_paths.xml
+++ b/audio/panther/config/mixer_paths.xml
@@ -634,6 +634,10 @@
<ctl name="AMP PCM Gain" value="17"/>
</path>
+ <path name="voice-dual-speaker">
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Main AMP Enable Switch" value="1"/>
diff --git a/audio/ravenclaw/config/audio_platform_configuration.xml b/audio/ravenclaw/config/audio_platform_configuration.xml
index 5d2fbc8..f57c505 100644
--- a/audio/ravenclaw/config/audio_platform_configuration.xml
+++ b/audio/ravenclaw/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
<!-- for input -->
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -283,7 +283,7 @@
<external_module>
<module libname="audio_spk_35l41.so"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
- <module libname="audio_fortemedia_aoc.so"/>
+ <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/ravenclaw/config/mixer_paths.xml b/audio/ravenclaw/config/mixer_paths.xml
index 2d3db43..141f8c9 100644
--- a/audio/ravenclaw/config/mixer_paths.xml
+++ b/audio/ravenclaw/config/mixer_paths.xml
@@ -623,6 +623,10 @@
<ctl name="R Main AMP Enable Switch" value="1"/>
</path>
+ <path name="voice-dual-speaker">
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Main AMP Enable Switch" value="1"/>
