Evolution-X-Tensor/device_google_pantah
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "audio: voip downlink to stereo" am: a692a92f6f

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/17052769

Change-Id: I09cda74a8cfa43996f2e9a9f3fc49f21a8f672ed
This commit is contained in:
Carter Hsu 2022-03-02 12:18:45 +00:00 • committed by Automerger Merge Worker
commit ce66adb9f9
8 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/cheetah/config/audio_platform_configuration.xml
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"/>

4
audio/cheetah/config/mixer_paths.xml
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"/>

4
audio/cloudripper/config/audio_platform_configuration.xml
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"/>

4
audio/cloudripper/config/mixer_paths.xml
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>

4
audio/panther/config/audio_platform_configuration.xml
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"/>

4
audio/panther/config/mixer_paths.xml
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"/>

4
audio/ravenclaw/config/audio_platform_configuration.xml
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"/>

4
audio/ravenclaw/config/mixer_paths.xml
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"/>