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

audio: spatial audio on spk am: 4dfbfbaa57

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

Change-Id: I8ddc0ffb3751f02c71ea50ae57e9850dd7e30c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jasmine Cha 2023-08-23 17:51:34 +00:00 • committed by Automerger Merge Worker
commit ba904ee029
6 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
audio/tangorpro/config/audio_platform_configuration.xml
View file

@ -188,7 +188,7 @@
<!-- dev1: voice-call downlink dev2: voice-clal uplink -->
<usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
<!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="30" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="3"/>
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="3" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="3"/>
<!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer -->
<usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/>
<!-- dev1: audio dev2: haptic -->
@ -288,6 +288,7 @@
<item component="TUNING_COMPONENT_FORTEMEDIA" id="3"/>
<item component="TUNING_COMPONENT_APMG3" id="24"/>
<item component="TUNING_COMPONENT_CAMCORDER" id="6"/>
<item component="TUNING_COMPONENT_STEREO_SPATIALIZER" id="26"/>
</xlate_id>
<voip_db_mapping>
@ -300,7 +301,7 @@
</device_handle>
<external_module>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4 Extensions=StereoSpatializer"/>
<module libname="audio_spk_35l41.so" argu="SpeakerNum=4,Rotation"/>
<module libname="audio_fortemedia_aoc.so" argu="RTN_SUP=y DOCK_CHARGER_MONITOR=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/>

2
audio/tangorpro/config/audio_policy_configuration.xml
View file

@ -193,7 +193,7 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<route type="mix" sink="Speaker"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output,immersive_out"/>
<route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
<route type="mix" sink="BT A2DP Out"

6
audio/tangorpro/config/mixer_paths.xml
View file

@ -519,15 +519,15 @@
</path>
<path name="immersive-playbackP">
<ctl name="TDM_0_RX Mixer IMSV" value="1"/>
<ctl name="TDM_0_RX Mixer EP4" value="1"/>
</path>
<path name="immersive-playbackP bt">
<ctl name="BT_RX Mixer IMSV" value="1"/>
<ctl name="BT_RX Mixer EP4" value="1"/>
</path>
<path name="immersive-playbackP usb-headphone">
<ctl name="USB_RX Mixer IMSV" value="1"/>
<ctl name="USB_RX Mixer EP4" value="1"/>
</path>
<path name="voip-playbackP">

21
audio/tangorpro/tuning/waves/waves_config.ini
View file

@ -30,6 +30,7 @@ SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC_2_1 = OM:6,SM:2
SPEAKER_RESERVED_MUSIC = OM:1,SM:3,OST:OST_SPEAKER
DOCKSPEAKER_MUSIC = OM:4,SM:2
DOCKSPEAKER_VOICE_MUSIC = OM:7,SM:2
@ -39,7 +40,7 @@ DOCKSPEAKER_VOICE_MUSIC = OM:7,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_2_1
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_2_1|SPEAKER_RESERVED_MUSIC
DOCKSPEAKER_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:DOCKSPEAKER_MUSIC|DOCKSPEAKER_VOICE_MUSIC
[COEFS_CONVERTER_SETTING]
@ -54,14 +55,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatIncrement=8
[CUSTOM_ACTION_259]
CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0|1,PRESET:SPEAKER_SAFE_CALL
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:4096|16384|67108864:0|1|4:0|1,PRESET:DOCKSPEAKER_MUSIC
CASE_5=PRIORITY:4,NUMBERS:2:0|1:1,PRESET:SPEAKER_MUSIC_2_1
CASE_6=PRIORITY:5,NUMBERS:4096|16384|67108864:2|3:0|1,PRESET:DOCKSPEAKER_VOICE_MUSIC
CASE_1=PRIORITY:0,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0|1:0|1,PRESET:SPEAKER_SAFE_CALL
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0|1:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:4096|16384|67108864:0|1|4:0|1:0|1,PRESET:DOCKSPEAKER_MUSIC
CASE_5=PRIORITY:4,NUMBERS:2:0|1:1:0|1,PRESET:SPEAKER_MUSIC_2_1
CASE_6=PRIORITY:5,NUMBERS:4096|16384|67108864:2|3:0|1:0|1,PRESET:DOCKSPEAKER_VOICE_MUSIC
CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_RESERVED_MUSIC
# Action 259 parameters: audio_devices_t, audio_mode_t, is_dock_speaker_active_t
# Action 259 parameters: audio_devices_t, audio_mode_t, is_dock_speaker_active_t, is_spatial_audio_active_t
# - audio_devices_t : current active device
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
# - is_dock_speaker_active_t: 0 - Disabled, 1 - Enabled
# - is_dock_speaker_active_t: 0 - Disabled, 1 - Enabled
# - is_spatial_audio_active_t: 0 - Disabled, 1 - Enabled

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

Binary file not shown.

3
device-tangorpro.mk
View file

@ -114,7 +114,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
ro.audio.spatializer_enabled=true \
persist.vendor.audio.spatializer.speaker_enabled=true
# Bluetooth OPUS codec
PRODUCT_PRODUCT_PROPERTIES += \