From 51e45212b5b3b4609c9d11d7cb4b74a94c018f40 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Thu, 3 Nov 2022 21:16:23 +0800
Subject: [PATCH] sdm660-common: audio: enable speaker spatializer

* 0605 build lib is same file as 0805 felix/cheetah
Bug: 260779305
Test: manual test

Change-Id: Ifbcee9faebb7607ec08db947e69d1d2d31d9eaab
Signed-off-by: Jasmine Cha <chajasmine@google.com>
Signed-off-by: pix106 <sbordenave@gmail.com>
---
 configs/audio/audio_policy_configuration.xml | 2 +-
 properties/vendor.prop                       | 1 +
 proprietary-files.txt                        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
index 4787bb55..698cde9f 100644
--- a/configs/audio/audio_policy_configuration.xml
+++ b/configs/audio/audio_policy_configuration.xml
@@ -273,7 +273,7 @@
                 <route type="mix" sink="Earpiece"
                        sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,immersive_out"/>
                 <route type="mix" sink="Wired Headset"
                        sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,immersive_out"/>
                 <route type="mix" sink="Wired Headphones"
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 75e9e8b1..6fdea501 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -117,6 +117,7 @@ persist.vendor.qcom.bluetooth.soc=cherokee
 ro.bluetooth.a2dp_offload.supported=true
 ro.vendor.fm.use_audio_session=true
 ro.audio.spatializer_enabled=true
+persist.vendor.audio.spatializer.speaker_enabled=true
 
 # Camera
 vendor.camera.aux.packageblacklist=com.discord
diff --git a/proprietary-files.txt b/proprietary-files.txt
index bd86d76e..fb88eea9 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -95,7 +95,7 @@ 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
+# Audio FX modules - from google/cheetah/cheetah:13/TQ3A.230805.001/10316531:user/release-keys
 vendor/lib/soundfx/libspatialaudio.so|b26727b8887dad56f5e183f7145487c88bd2f065
 
 # Audio FX modules - from Honeywell/hon660/hon660:12/94.00.03/0037:user/release-keys