From 70859eb8377ea39a02a113a3eae3ba511bced86c Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 23 Sep 2022 16:53:02 +0800 Subject: [PATCH] audio: enable hinge angle control and BAACL Bug: 247793430 Test: manual test / LR mixed / LR swap Signed-off-by: Jasmine Cha Change-Id: Ib3af6e2aeba1f90000e88fd6aceddd6aef85518d --- .../config/audio_platform_configuration.xml | 3 ++ audio/felix/tuning/waves/waves_config.ini | 47 +++++++++++-------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml index 88a64f7..6f1cc2b 100644 --- a/audio/felix/config/audio_platform_configuration.xml +++ b/audio/felix/config/audio_platform_configuration.xml @@ -233,6 +233,9 @@ + + + diff --git a/audio/felix/tuning/waves/waves_config.ini b/audio/felix/tuning/waves/waves_config.ini index cf922f6..ff1266c 100644 --- a/audio/felix/tuning/waves/waves_config.ini +++ b/audio/felix/tuning/waves/waves_config.ini @@ -5,7 +5,6 @@ # Putting any value other than 1 would be equivalent to not supported. ######################################################################################################## [HAL_SUPPORTED_FEATURES] -CUSTOM_ACTION_256=0 CUSTOM_ACTION_257=1 ######################################################################################################## @@ -27,12 +26,16 @@ 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. ######################################################################################################## [HAL_SUPPORTED_PRESETS] -SPEAKER_MUSIC_UNFOLDED = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_FOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_MUSIC_UNFOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_MUSIC_CLAMSHELL_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER SPEAKER_MUSIC_FOLDED = OM:1,SM:2,OST:OST_SPEAKER -SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_UNFOLDED = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_CLAMSHELL = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_RESERVED = OM:1,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. @@ -40,9 +43,7 @@ HEADSET_MUSIC = OM:2,SM:2 # This can be configured by Waves or platform vendor. ######################################################################################################## [HAL_SUPPORTED_CONTROLS] -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 -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE|SPEAKER_MUSIC_UNFOLDED_THROTTLE|SPEAKER_MUSIC_CLAMSHELL_THROTTLE|SPEAKER_MUSIC_RESERVED_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_MUSIC_FOLDED|SPEAKER_MUSIC_UNFOLDED|SPEAKER_MUSIC_CLAMSHELL|SPEAKER_MUSIC_RESERVED|SPEAKER_SAFE_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so @@ -55,15 +56,23 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -# CUSTOM_ACTION_LR_MIXED (dev/mode) -[CUSTOM_ACTION_256] -CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC - -# CUSTOM_ACTION_LR_MIXED_FOLDED (dev/mode/folded) [CUSTOM_ACTION_257] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_UNFOLDED -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0|1,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0|1,PRESET:SPEAKER_SAFE_MUSIC -CASE_4=PRIORITY:3,NUMBERS:2:0|1:1,PRESET:SPEAKER_MUSIC_FOLDED +CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3,PRESET:SPEAKER_MUSIC_FOLDED +CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_CLAMSHELL +CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:2,PRESET:SPEAKER_MUSIC_UNFOLDED +CASE_4=PRIORITY:3,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC +CASE_5=PRIORITY:4,NUMBERS:1|4194304:0|1:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC +CASE_6=PRIORITY:5,NUMBERS:2:0|1:0:0|3,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE +CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:2,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE +CASE_9=PRIORITY:8,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_10=PRIORITY:9,NUMBERS:1|4194304:0|1:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +#CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:1|2,PRESET:SPEAKER_MUSIC_RESERVED +#CASE_12=PRIORITY:11,NUMBERS:2:0|1:0:1|2,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE + +# Action 257 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t(optional) +# - audio_devices_t : current active device +# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip +# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed +# - folded_type_t: 0 - Close, 1 -Clamshell, 2 - Open, 3 - unknown +# - sound_usage_t(optional): 0 - Music, 1 - Movie