From cb88a232bfc04096e095018aa0a4d127af9edcf5 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 19 Jan 2022 10:44:16 +0800 Subject: [PATCH] audio: waves: enable battery throttle(action 258) - use the same sound mode since preset file isn't ready Bug: 204271308 Test: lr swap/mixed, mute, bypass Enable throttle: adb shell "echo 24000 > /dev/thermal/tz-by-name/battery/emul_temp" && adb shell "echo 91 > /dev/thermal/tz-by-name/soc/emul_temp" Disable throttle: adb shell "echo 26000 > /dev/thermal/tz-by-name/battery/emul_temp" && adb shell "echo 79 > /dev/thermal/tz-by-name/soc/emul_temp" Signed-off-by: Jasmine Cha Change-Id: Iab25f082210d7f43e3439b010754332f6a48e511 --- audio/cheetah/tuning/waves/waves_config.ini | 18 ++++++++++++------ .../cloudripper/tuning/waves/waves_config.ini | 18 ++++++++++++------ audio/panther/tuning/waves/waves_config.ini | 18 ++++++++++++------ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/audio/cheetah/tuning/waves/waves_config.ini b/audio/cheetah/tuning/waves/waves_config.ini index ba12a8e..36e092a 100644 --- a/audio/cheetah/tuning/waves/waves_config.ini +++ b/audio/cheetah/tuning/waves/waves_config.ini @@ -5,7 +5,7 @@ # Putting any value other than 1 would be equivalent to not supported. ######################################################################################################## [HAL_SUPPORTED_FEATURES] -CUSTOM_ACTION_256=1 +CUSTOM_ACTION_258=1 ######################################################################################################## # This defined the options of supported sample rates. @@ -26,6 +26,9 @@ 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_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_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER @@ -37,7 +40,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 +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 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 @@ -52,7 +55,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -[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_258] +CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,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 diff --git a/audio/cloudripper/tuning/waves/waves_config.ini b/audio/cloudripper/tuning/waves/waves_config.ini index ba12a8e..36e092a 100644 --- a/audio/cloudripper/tuning/waves/waves_config.ini +++ b/audio/cloudripper/tuning/waves/waves_config.ini @@ -5,7 +5,7 @@ # Putting any value other than 1 would be equivalent to not supported. ######################################################################################################## [HAL_SUPPORTED_FEATURES] -CUSTOM_ACTION_256=1 +CUSTOM_ACTION_258=1 ######################################################################################################## # This defined the options of supported sample rates. @@ -26,6 +26,9 @@ 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_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_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER @@ -37,7 +40,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 +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 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 @@ -52,7 +55,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -[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_258] +CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,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 diff --git a/audio/panther/tuning/waves/waves_config.ini b/audio/panther/tuning/waves/waves_config.ini index ba12a8e..36e092a 100644 --- a/audio/panther/tuning/waves/waves_config.ini +++ b/audio/panther/tuning/waves/waves_config.ini @@ -5,7 +5,7 @@ # Putting any value other than 1 would be equivalent to not supported. ######################################################################################################## [HAL_SUPPORTED_FEATURES] -CUSTOM_ACTION_256=1 +CUSTOM_ACTION_258=1 ######################################################################################################## # This defined the options of supported sample rates. @@ -26,6 +26,9 @@ 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_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_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER @@ -37,7 +40,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 +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 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 @@ -52,7 +55,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -[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_258] +CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,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