Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "audio: update waves tuning for phone call" into udc-d1-dev am: aa189ef3ef

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/23517120

Change-Id: I99bc287073743fb8940eadf509cb806ac58dc87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jasmine Cha 2023-06-02 09:33:24 +00:00 • committed by Automerger Merge Worker
commit 755bcf5695
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
audio/husky/tuning/waves/waves_config.ini
View file

@ -19,7 +19,7 @@ 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:0|14
######################################################################################################## ########################################################################################################
# This defines available preset configurations. # This defines available preset configurations.
@ -27,9 +27,11 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_PRESETS] [HAL_SUPPORTED_PRESETS]
SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,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_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
SPEAKER_SAFE_MUSIC_LITE = OM:9,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.
@ -37,7 +39,7 @@ SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
# 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_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE 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] [COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@ -52,10 +54,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
[CUSTOM_ACTION_260] [CUSTOM_ACTION_260]
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_MUSIC CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC_LITE
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_MUSIC_THROTTLE CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
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 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t # Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed

BIN
audio/husky/tuning/waves/waves_preset.mps
View file

Binary file not shown.

12
audio/shiba/tuning/waves/waves_config.ini
View file

@ -27,9 +27,11 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|14
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_PRESETS] [HAL_SUPPORTED_PRESETS]
SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,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_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
SPEAKER_SAFE_MUSIC_LITE = OM:9,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.
@ -37,7 +39,7 @@ SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
# 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_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE 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] [COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@ -52,10 +54,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
[CUSTOM_ACTION_260] [CUSTOM_ACTION_260]
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_MUSIC CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC_LITE
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_MUSIC_THROTTLE CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
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 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t # Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed

BIN
audio/shiba/tuning/waves/waves_preset.mps
View file

Binary file not shown.