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

Merge "audio: enable waves BAACL/playback throttle" into udc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2023-03-01 06:47:25 +00:00 • committed by Android (Google) Code Review
commit 706b609f5a
4 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
audio/husky/config/audio_platform_configuration.xml
View file

@ -246,6 +246,10 @@
</dsp_latency> </dsp_latency>
<soundcard_name name="google,aoc-snd-card" /> <soundcard_name name="google,aoc-snd-card" />
<features>
<feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
<feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN,ThermistorType:SKIN,ThrottlingSeverity:MODERATE"/>
</features>
<cfg_attr> <cfg_attr>
<cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/> <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>
@ -299,7 +303,7 @@
<external_module> <external_module>
<module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/> <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/> <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>

23
audio/husky/tuning/waves/waves_config.ini
View file

@ -5,7 +5,7 @@
# Putting any value other than 1 would be equivalent to not supported. # Putting any value other than 1 would be equivalent to not supported.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_FEATURES] [HAL_SUPPORTED_FEATURES]
CUSTOM_ACTION_256=1 CUSTOM_ACTION_260=1
######################################################################################################## ########################################################################################################
# This defined the options of supported sample rates. # This defined the options of supported sample rates.
@ -26,10 +26,10 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
# This should be configured by Waves only unless platform vendor is familiar with MPS structure. # This should be configured by Waves only unless platform vendor is familiar with MPS structure.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_PRESETS] [HAL_SUPPORTED_PRESETS]
SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
HEADSET_MUSIC = OM:2,SM:2
######################################################################################################## ########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it. # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@ -37,9 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
# This can be configured by Waves or platform vendor. # This can be configured by Waves or platform vendor.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_CONTROLS] [HAL_SUPPORTED_CONTROLS]
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
[COEFS_CONVERTER_SETTING] [COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@ -52,7 +50,12 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatSampleSize=4 #AudioFormatSampleSize=4
#AudioFormatIncrement=8 #AudioFormatIncrement=8
[CUSTOM_ACTION_256] [CUSTOM_ACTION_260]
CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed

6
audio/shiba/config/audio_platform_configuration.xml
View file

@ -246,6 +246,10 @@
</dsp_latency> </dsp_latency>
<soundcard_name name="google,aoc-snd-card" /> <soundcard_name name="google,aoc-snd-card" />
<features>
<feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
<feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN,ThermistorType:SKIN,ThrottlingSeverity:MODERATE"/>
</features>
<cfg_attr> <cfg_attr>
<cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/> <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>
@ -299,7 +303,7 @@
<external_module> <external_module>
<module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/> <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/> <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>

23
audio/shiba/tuning/waves/waves_config.ini
View file

@ -5,7 +5,7 @@
# Putting any value other than 1 would be equivalent to not supported. # Putting any value other than 1 would be equivalent to not supported.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_FEATURES] [HAL_SUPPORTED_FEATURES]
CUSTOM_ACTION_256=1 CUSTOM_ACTION_260=1
######################################################################################################## ########################################################################################################
# This defined the options of supported sample rates. # This defined the options of supported sample rates.
@ -26,10 +26,10 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
# This should be configured by Waves only unless platform vendor is familiar with MPS structure. # This should be configured by Waves only unless platform vendor is familiar with MPS structure.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_PRESETS] [HAL_SUPPORTED_PRESETS]
SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
HEADSET_MUSIC = OM:2,SM:2
######################################################################################################## ########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it. # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@ -37,9 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
# This can be configured by Waves or platform vendor. # This can be configured by Waves or platform vendor.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_CONTROLS] [HAL_SUPPORTED_CONTROLS]
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
[COEFS_CONVERTER_SETTING] [COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@ -52,7 +50,12 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatSampleSize=4 #AudioFormatSampleSize=4
#AudioFormatIncrement=8 #AudioFormatIncrement=8
[CUSTOM_ACTION_256] [CUSTOM_ACTION_260]
CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed