Revert "audio: voip downlink to stereo"

Revert submission 16996078-voip_speaker_separation-master-table-tm-dev

Reason for revert: <AoC is reverted by b/222138584>
Reverted Changes:
I85c654319:audio: voip downlink to stereo
Iac83ae74c:audio: iS900 table release of Fortemedia

Change-Id: Ib741e38913ab39af916f3dbb60bd08159c0d6cf2
This commit is contained in:
Carter Hsu 2022-03-02 04:32:54 +00:00
parent a0982ca489
commit a692a92f6f
8 changed files with 8 additions and 24 deletions

View file

@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic --> <!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/> <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer --> <!-- 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" pcm_ch="2"/> <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
<!-- for input --> <!-- 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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@ -286,7 +286,7 @@
<external_module> <external_module>
<module libname="audio_spk_35l41.so" argu="EnableDualControl"/> <module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/> <module libname="audio_fortemedia_aoc.so"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -634,10 +634,6 @@
<ctl name="AMP PCM Gain" value="17"/> <ctl name="AMP PCM Gain" value="17"/>
</path> </path>
<path name="voice-dual-speaker">
<path name="speaker" />
</path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A"/> <ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Main AMP Enable Switch" value="1"/> <ctl name="R Main AMP Enable Switch" value="1"/>

View file

@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic --> <!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/> <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer --> <!-- 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" pcm_ch="2"/> <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
<!-- for input --> <!-- 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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@ -282,7 +282,7 @@
<external_module> <external_module>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/> <module libname="audio_fortemedia_aoc.so"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -640,10 +640,6 @@
<ctl name="R AMP Enable Switch" value="1"/> <ctl name="R AMP Enable Switch" value="1"/>
</path> </path>
<path name="voice-dual-speaker">
<path name="speaker" />
</path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R AMP Enable Switch" value="1"/> <ctl name="R AMP Enable Switch" value="1"/>
</path> </path>

View file

@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic --> <!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/> <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer --> <!-- 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" pcm_ch="2"/> <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
<!-- for input --> <!-- 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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@ -286,7 +286,7 @@
<external_module> <external_module>
<module libname="audio_spk_35l41.so" argu="EnableDualControl"/> <module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/> <module libname="audio_fortemedia_aoc.so"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -634,10 +634,6 @@
<ctl name="AMP PCM Gain" value="17"/> <ctl name="AMP PCM Gain" value="17"/>
</path> </path>
<path name="voice-dual-speaker">
<path name="speaker" />
</path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A"/> <ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Main AMP Enable Switch" value="1"/> <ctl name="R Main AMP Enable Switch" value="1"/>

View file

@ -187,7 +187,7 @@
<!-- dev1: audio dev2: haptic --> <!-- dev1: audio dev2: haptic -->
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/> <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
<!-- for VOIP output, 4 * 10ms buffer --> <!-- 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" pcm_ch="2"/> <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
<!-- for input --> <!-- 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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@ -283,7 +283,7 @@
<external_module> <external_module>
<module libname="audio_spk_35l41.so"/> <module libname="audio_spk_35l41.so"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/> <module libname="audio_fortemedia_aoc.so"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -623,10 +623,6 @@
<ctl name="R Main AMP Enable Switch" value="1"/> <ctl name="R Main AMP Enable Switch" value="1"/>
</path> </path>
<path name="voice-dual-speaker">
<path name="speaker" />
</path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A"/> <ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Main AMP Enable Switch" value="1"/> <ctl name="R Main AMP Enable Switch" value="1"/>