audio: update waves related settings
1. add throttle sensor info for waves module. 2. use default custom action for unsupported projects. Bug: 230280648 Test: adb shell audio_waves_custom_actions_test Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: I71aa59a43b11e7a57834e44da6793b2cfa7c76ed
This commit is contained in:
parent
87f9dffa44
commit
00a456a976
3 changed files with 8 additions and 14 deletions
|
@ -286,7 +286,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 BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL"/>
|
||||||
<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" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
|
||||||
<module libname="liboffloadeffect.so"/>
|
<module libname="liboffloadeffect.so"/>
|
||||||
<module libname="audio_amcs_ext.so"/>
|
<module libname="audio_amcs_ext.so"/>
|
||||||
|
|
|
@ -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_258=1
|
CUSTOM_ACTION_256=1
|
||||||
|
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
# This defined the options of supported sample rates.
|
# This defined the options of supported sample rates.
|
||||||
|
@ -26,9 +26,6 @@ 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:2,OST:OST_SPEAKER
|
|
||||||
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
|
|
||||||
SPEAKER_SAFE_CALL_THROTTLE = OM:10,SM:2,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
|
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
|
||||||
|
@ -40,7 +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_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_CALL_THROTTLE
|
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
|
||||||
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
|
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
|
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
|
||||||
|
|
||||||
|
@ -55,10 +52,7 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
||||||
#AudioFormatSampleSize=4
|
#AudioFormatSampleSize=4
|
||||||
#AudioFormatIncrement=8
|
#AudioFormatIncrement=8
|
||||||
|
|
||||||
[CUSTOM_ACTION_258]
|
[CUSTOM_ACTION_256]
|
||||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC
|
CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC
|
||||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL
|
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL
|
||||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC
|
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC
|
||||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1:4,PRESET:SPEAKER_MUSIC_THROTTLE
|
|
||||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:4,PRESET:SPEAKER_SAFE_CALL_THROTTLE
|
|
||||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:4,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
|
||||||
|
|
|
@ -286,7 +286,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 BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL"/>
|
||||||
<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" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
|
||||||
<module libname="liboffloadeffect.so"/>
|
<module libname="liboffloadeffect.so"/>
|
||||||
<module libname="audio_amcs_ext.so"/>
|
<module libname="audio_amcs_ext.so"/>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue