diff --git a/audio/caiman/config/audio_platform_configuration.xml b/audio/caiman/config/audio_platform_configuration.xml index bd99fd25..a77bf64a 100644 --- a/audio/caiman/config/audio_platform_configuration.xml +++ b/audio/caiman/config/audio_platform_configuration.xml @@ -247,6 +247,11 @@ + + + + + @@ -299,7 +304,7 @@ - + diff --git a/audio/caiman/tuning/waves/waves_config.ini b/audio/caiman/tuning/waves/waves_config.ini index 36e092a5..b5acfb80 100644 --- a/audio/caiman/tuning/waves/waves_config.ini +++ b/audio/caiman/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_258=1 +CUSTOM_ACTION_260=1 ######################################################################################################## # This defined the options of supported sample rates. @@ -19,20 +19,22 @@ SR_COMMON = 48000 # This can be configured by Waves or platform vendor. ######################################################################################################## [HAL_ORIENTATION_SUBTYPES] -OST_SPEAKER = 0:12,90:13,180:12,270:0|13 +OST_SPEAKER = 0:12,90:13,180:12,270:0|14 ######################################################################################################## # This defines available preset configurations. # 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_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3 +SPEAKER_SAFE_MUSIC_THROTTLE_LITE = OM:9,SM:3 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 -HEADSET_MUSIC = OM:2,SM:2 +SPEAKER_SAFE_MUSIC = OM:10,SM:2 +SPEAKER_SAFE_MUSIC_LITE = OM:9,SM:2 +SPEAKER_MUSIC_RESERVED = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER +# _RESERVED OM and SM are temporary and will be updated with tuning file. ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -40,9 +42,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_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 +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE_LITE|SPEAKER_SAFE_MUSIC_LITE [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so @@ -55,10 +55,17 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -[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 +[CUSTOM_ACTION_260] +CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED +CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE +# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t +# - 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 +# - sound_usage_t: 0 - Music, 1 - Movie \ No newline at end of file diff --git a/audio/komodo/config/audio_platform_configuration.xml b/audio/komodo/config/audio_platform_configuration.xml index bd99fd25..a77bf64a 100644 --- a/audio/komodo/config/audio_platform_configuration.xml +++ b/audio/komodo/config/audio_platform_configuration.xml @@ -247,6 +247,11 @@ + + + + + @@ -299,7 +304,7 @@ - + diff --git a/audio/komodo/tuning/waves/waves_config.ini b/audio/komodo/tuning/waves/waves_config.ini index 36e092a5..b5acfb80 100644 --- a/audio/komodo/tuning/waves/waves_config.ini +++ b/audio/komodo/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_258=1 +CUSTOM_ACTION_260=1 ######################################################################################################## # This defined the options of supported sample rates. @@ -19,20 +19,22 @@ SR_COMMON = 48000 # This can be configured by Waves or platform vendor. ######################################################################################################## [HAL_ORIENTATION_SUBTYPES] -OST_SPEAKER = 0:12,90:13,180:12,270:0|13 +OST_SPEAKER = 0:12,90:13,180:12,270:0|14 ######################################################################################################## # This defines available preset configurations. # 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_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3 +SPEAKER_SAFE_MUSIC_THROTTLE_LITE = OM:9,SM:3 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 -HEADSET_MUSIC = OM:2,SM:2 +SPEAKER_SAFE_MUSIC = OM:10,SM:2 +SPEAKER_SAFE_MUSIC_LITE = OM:9,SM:2 +SPEAKER_MUSIC_RESERVED = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER +# _RESERVED OM and SM are temporary and will be updated with tuning file. ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -40,9 +42,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_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 +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE_LITE|SPEAKER_SAFE_MUSIC_LITE [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so @@ -55,10 +55,17 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -[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 +[CUSTOM_ACTION_260] +CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED +CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE +# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t +# - 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 +# - sound_usage_t: 0 - Music, 1 - Movie \ No newline at end of file diff --git a/audio/tokay/config/audio_platform_configuration.xml b/audio/tokay/config/audio_platform_configuration.xml index bd99fd25..a77bf64a 100644 --- a/audio/tokay/config/audio_platform_configuration.xml +++ b/audio/tokay/config/audio_platform_configuration.xml @@ -247,6 +247,11 @@ + + + + + @@ -299,7 +304,7 @@ - + diff --git a/audio/tokay/tuning/waves/waves_config.ini b/audio/tokay/tuning/waves/waves_config.ini index 36e092a5..b5acfb80 100644 --- a/audio/tokay/tuning/waves/waves_config.ini +++ b/audio/tokay/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_258=1 +CUSTOM_ACTION_260=1 ######################################################################################################## # This defined the options of supported sample rates. @@ -19,20 +19,22 @@ SR_COMMON = 48000 # This can be configured by Waves or platform vendor. ######################################################################################################## [HAL_ORIENTATION_SUBTYPES] -OST_SPEAKER = 0:12,90:13,180:12,270:0|13 +OST_SPEAKER = 0:12,90:13,180:12,270:0|14 ######################################################################################################## # This defines available preset configurations. # 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_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3 +SPEAKER_SAFE_MUSIC_THROTTLE_LITE = OM:9,SM:3 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 -HEADSET_MUSIC = OM:2,SM:2 +SPEAKER_SAFE_MUSIC = OM:10,SM:2 +SPEAKER_SAFE_MUSIC_LITE = OM:9,SM:2 +SPEAKER_MUSIC_RESERVED = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER +# _RESERVED OM and SM are temporary and will be updated with tuning file. ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -40,9 +42,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_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 +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE_LITE|SPEAKER_SAFE_MUSIC_LITE [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so @@ -55,10 +55,17 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -[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 +[CUSTOM_ACTION_260] +CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED +CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE +# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t +# - 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 +# - sound_usage_t: 0 - Music, 1 - Movie \ No newline at end of file