From 0bcf3c794d5a561bfaf213145b535ca0e2762c51 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Sun, 16 Jul 2023 10:33:00 +0800
Subject: [PATCH] sdm660-common: configuration for spatial audio

Update audio configuration to enable spatial audio:
- build with spatial audio feature enabled and rondo library
- list spatializer effect in audio effect configuration file
- update audio policy configuration files to declare spatializer output
- declare immersive end point in audio platform configuration

* Alcatraz: not enable on bt-a2dp, usb out, tested it will create "bzzzzzzzz" like noise, not in good effect, only works well for wired headphone.
* update lib to July

Bug: 237677573
Test: spatial audio playback
Change-Id: Ic9c32d813a19ba2789425e12ee9016d53ab30678
Co-authored-by: Alcatraz323 <alcatraz32323@gmail.com>
Signed-off-by: pix106 <sbordenave@gmail.com>
---
 configs/audio/audio_effects.xml              | 2 ++
 configs/audio/audio_policy_configuration.xml | 8 ++++++--
 properties/vendor.prop                       | 1 +
 proprietary-files.txt                        | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configs/audio/audio_effects.xml b/configs/audio/audio_effects.xml
index 3920fd4f..e4f6a3d3 100644
--- a/configs/audio/audio_effects.xml
+++ b/configs/audio/audio_effects.xml
@@ -45,6 +45,7 @@
         <library name="audiosphere" path="libasphere.so"/>
         <library name="dirac" path="libdirac.so"/>
         <library name="misoundfx" path="libmisoundfx.so"/>
+        <library name="spatializer" path="libspatialaudio.so"/>
     </libraries>
     <effects>
         <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
@@ -100,6 +101,7 @@
         <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
         <effect name="dirac" library="dirac" uuid="e069d9e0-8329-11df-9168-0002a5d5c51b"/>
         <effect name="misoundfx" library="misoundfx" uuid="5b8e36a5-144a-4c38-b1d7-0002a5d5c51b"/>
+        <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
     </effects>
     <postprocess>
         <stream type="music">
diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
index ed84f4b6..4787bb55 100644
--- a/configs/audio/audio_policy_configuration.xml
+++ b/configs/audio/audio_policy_configuration.xml
@@ -175,6 +175,10 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 96000 192000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3 AUDIO_CHANNEL_INDEX_MASK_4"/>
                 </mixPort>
+                <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="voice_rx" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
@@ -271,9 +275,9 @@
                 <route type="mix" sink="Speaker"
                        sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Wired Headset"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,immersive_out"/>
                 <route type="mix" sink="Wired Headphones"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,immersive_out"/>
                 <route type="mix" sink="Line"
                        sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/>
                 <route type="mix" sink="HDMI"
diff --git a/properties/vendor.prop b/properties/vendor.prop
index df73a66c..75e9e8b1 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -116,6 +116,7 @@ persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.soc=cherokee
 ro.bluetooth.a2dp_offload.supported=true
 ro.vendor.fm.use_audio_session=true
+ro.audio.spatializer_enabled=true
 
 # Camera
 vendor.camera.aux.packageblacklist=com.discord
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c46ae60f..bd86d76e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -95,6 +95,9 @@ vendor/lib64/libqtigef.so|7b8bf697aaec567ff1f0cfd1fdc352a563df864a
 system_ext/etc/permissions/audiosphere.xml|015ad7be4921039238bfa3d34d052d752453e49c
 -system_ext/framework/audiosphere.jar|3c42dff6da0571acd9ea466983c7f6354d588bb3
 
+# Audio FX modules - from cheetah-user 13 TQ3A.230605.012 10204971 release-keys
+vendor/lib/soundfx/libspatialaudio.so|b26727b8887dad56f5e183f7145487c88bd2f065
+
 # Audio FX modules - from Honeywell/hon660/hon660:12/94.00.03/0037:user/release-keys
 vendor/lib/soundfx/libasphere.so|316ca9f69ff8a97444003624d533cad9ccd642d0
 vendor/lib/soundfx/libqcbassboost.so|fe97b4b27d014436d8b77beec605c5a67828002d