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

Merge "audio: waves: support speaker spatial in audio hal" into tm-qpr-dev am: 9f06519c78 am: 4f9cf70659

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

Change-Id: Ic8bddfabd1bf12858211c2c5fa314d94eb5231c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-11-24 03:14:19 +00:00 • committed by Automerger Merge Worker
commit 6a739c33a3
2 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
audio/felix/tuning/waves/waves_config.ini
View file

@ -27,15 +27,18 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
########################################################################################################
[HAL_SUPPORTED_PRESETS]
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_MUSIC_UNFOLDED_THROTTLE= OM:9,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC_CLAMSHELL_THROTTLE= OM:60,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_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_MUSIC_UNFOLDED = OM:9,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC_CLAMSHELL = OM:60,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC_RESERVED_UNFOLDED = OM:11,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC_RESERVED_CLAMSHELL = OM:12,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE = OM:11,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC_RESERVED_CLAMSHELL_THROTTLE = OM:12,SM:3,OST:OST_SPEAKER
########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it.
@ -43,7 +46,7 @@ SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
# This can be configured by Waves or platform vendor.
########################################################################################################
[HAL_SUPPORTED_CONTROLS]
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
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_CLAMSHELL_THROTTLE|SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_MUSIC_FOLDED|SPEAKER_MUSIC_UNFOLDED|SPEAKER_MUSIC_CLAMSHELL|SPEAKER_MUSIC_RESERVED_UNFOLDED|SPEAKER_MUSIC_RESERVED_CLAMSHELL|SPEAKER_SAFE_MUSIC
[COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@ -57,22 +60,26 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatIncrement=8
[CUSTOM_ACTION_257]
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
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED
CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL
CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED
CASE_4=PRIORITY:3,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_5=PRIORITY:4,NUMBERS:1|4194304:0|1:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_6=PRIORITY:5,NUMBERS:2:0|1:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE
CASE_9=PRIORITY:8,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_10=PRIORITY:9,NUMBERS:1|4194304:0|1:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED
CASE_12=PRIORITY:11,NUMBERS:2:0|1:1|2:1:1,PRESET:SPEAKER_MUSIC_RESERVED_CLAMSHELL
CASE_13=PRIORITY:12,NUMBERS:2:0|1:0:2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE
CASE_14=PRIORITY:13,NUMBERS:2:0|1:0:1:1,PRESET:SPEAKER_MUSIC_RESERVED_CLAMSHELL_THROTTLE
# Action 257 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t(optional)
# Action 257 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_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
# - folded_type_t: 0 - Close, 1 -Clamshell, 2 - Open, 3 - unknown
# - sound_usage_t(optional): 0 - Music, 1 - Movie
# - sound_usage_t: 0 - Music, 1 - Movie

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

Binary file not shown.