audio: waves: update BAACL mps and ini
Bug: 203794965 Test: manual test P10: b/203794965#comment7 C10: b/203817007#comment10 Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: I758791e6311ac1e33c1dd2aa16ad40bd636d9c7f
This commit is contained in:
parent
f37b5b2c9b
commit
22fe48b297
4 changed files with 16 additions and 24 deletions
|
@ -6,7 +6,6 @@
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
[HAL_SUPPORTED_FEATURES]
|
[HAL_SUPPORTED_FEATURES]
|
||||||
CUSTOM_ACTION_258=1
|
CUSTOM_ACTION_258=1
|
||||||
# Action 258 parameters: [dev, mode, throttle control state]
|
|
||||||
|
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
# This defined the options of supported sample rates.
|
# This defined the options of supported sample rates.
|
||||||
|
@ -20,20 +19,17 @@ SR_COMMON = 48000
|
||||||
# This can be configured by Waves or platform vendor.
|
# This can be configured by Waves or platform vendor.
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
[HAL_ORIENTATION_SUBTYPES]
|
[HAL_ORIENTATION_SUBTYPES]
|
||||||
OST_SPEAKER = 0:12,90:13,180:12,270:0|13
|
OST_SPEAKER = 0:12,90:13,180:12,270:14
|
||||||
|
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
# This defines available preset configurations.
|
# This defines available preset configurations.
|
||||||
# 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_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
|
||||||
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
|
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,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
|
|
||||||
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.
|
||||||
|
@ -41,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_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_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
|
||||||
|
@ -58,8 +52,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
||||||
|
|
||||||
[CUSTOM_ACTION_258]
|
[CUSTOM_ACTION_258]
|
||||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,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:1|2,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:1|2,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_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_CALL_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
|
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||||
|
# Action 258 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
|
||||||
|
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
|
||||||
|
|
Binary file not shown.
|
@ -6,7 +6,6 @@
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
[HAL_SUPPORTED_FEATURES]
|
[HAL_SUPPORTED_FEATURES]
|
||||||
CUSTOM_ACTION_258=1
|
CUSTOM_ACTION_258=1
|
||||||
# Action 258 parameters: [dev, mode, throttle control state]
|
|
||||||
|
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
# This defined the options of supported sample rates.
|
# This defined the options of supported sample rates.
|
||||||
|
@ -20,20 +19,17 @@ SR_COMMON = 48000
|
||||||
# This can be configured by Waves or platform vendor.
|
# This can be configured by Waves or platform vendor.
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
[HAL_ORIENTATION_SUBTYPES]
|
[HAL_ORIENTATION_SUBTYPES]
|
||||||
OST_SPEAKER = 0:12,90:13,180:12,270:0|13
|
OST_SPEAKER = 0:12,90:13,180:12,270:14
|
||||||
|
|
||||||
########################################################################################################
|
########################################################################################################
|
||||||
# This defines available preset configurations.
|
# This defines available preset configurations.
|
||||||
# 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_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
|
||||||
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
|
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,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
|
|
||||||
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.
|
||||||
|
@ -41,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_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_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
|
||||||
|
@ -58,8 +52,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
||||||
|
|
||||||
[CUSTOM_ACTION_258]
|
[CUSTOM_ACTION_258]
|
||||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,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:1|2,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:1|2,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_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_CALL_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
|
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||||
|
# Action 258 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
|
||||||
|
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue