From e578df9f2cc71ccb8c879a81fd1c0932fee34f2d Mon Sep 17 00:00:00 2001
From: Nikhil Bhanu <nikhilbhanu@google.com>
Date: Tue, 25 Jun 2024 14:30:58 -0700
Subject: [PATCH] Audio: Enabled stereo spatialization property for Tegu, added
 opus codec enabled spatializer offload, added CAF config files for offloaded
 spatializer and updated the audio tables makefile

Bug: 323223919
Bug: 303920722
Bug: 348074352
Test: manual
Flag: com.android.media.audio.stereo_spatialization
Change-Id: Iecfd82a6285ab8e297b19e89f90ef3c018d275cb
---
 .../aidl_config/audio_platform_configuration.xml |   2 +-
 audio/tegu/audio-tables.mk                       |   7 +++++++
 audio/tegu/tuning/spatializer/base               | Bin 0 -> 3912 bytes
 audio/tegu/tuning/spatializer/mode_2_ch          | Bin 0 -> 916 bytes
 audio/tegu/tuning/spatializer/mode_6_ch          | Bin 0 -> 784 bytes
 audio/tegu/tuning/spatializer/mode_xaural        | Bin 0 -> 32 bytes
 device-tegu.mk                                   |  13 ++++++++-----
 7 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 audio/tegu/tuning/spatializer/base
 create mode 100644 audio/tegu/tuning/spatializer/mode_2_ch
 create mode 100644 audio/tegu/tuning/spatializer/mode_6_ch
 create mode 100644 audio/tegu/tuning/spatializer/mode_xaural

diff --git a/audio/tegu/aidl_config/audio_platform_configuration.xml b/audio/tegu/aidl_config/audio_platform_configuration.xml
index 909c635..ee381be 100644
--- a/audio/tegu/aidl_config/audio_platform_configuration.xml
+++ b/audio/tegu/aidl_config/audio_platform_configuration.xml
@@ -31,7 +31,7 @@
       <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
     </feature>
     <!-- <feature name="MicrophoneCompensation" /> -->
-    <!-- <feature name="spatializer-offload" /> -->
+    <feature name="spatializer-offload" />
   </features>
 
   <voipVolume>
diff --git a/audio/tegu/audio-tables.mk b/audio/tegu/audio-tables.mk
index 51822f6..2a78167 100644
--- a/audio/tegu/audio-tables.mk
+++ b/audio/tegu/audio-tables.mk
@@ -77,3 +77,10 @@ PRODUCT_COPY_FILES += \
     device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tas2572/ti_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ti_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural
\ No newline at end of file
diff --git a/audio/tegu/tuning/spatializer/base b/audio/tegu/tuning/spatializer/base
new file mode 100644
index 0000000000000000000000000000000000000000..38cc646e1f4db548866aac2bb32c0836467df2ba
GIT binary patch
literal 3912
zcmai%J8l#~5Qb|X-u2sFKM(<em7I`}-~%uVSmGFvSb~HrI3j{$5FnBH0yYGkfSeGC
z7>UgMU-z`PUG8p=H0<pEbyxq@Q(bFjX11$)XalpOC+F*W)|1Vy^~0dsn@{JGg1)KG
zflUl;t=AstbHyHovCI$G#9m#D;v@0$F~cZp@j=&*Ib%$Wy=nt_NwJeQ%(VL&JI1Lz
zuwIBKOT;2h&Xqyr{aT*0&X#U@;on>HSEb>h##uY0sr9*hd>Csm|Cg5Ve0&FAxr4K8
zEB^EjPVPIpZLnMP2cs@>|8sqv^!vZ9=dg4Ae4e>|p6p@RqRKw7276swX9JY+^}Xdf
zbLq(sV}hUledaZt*9HE<d#k*6g*S4`{p9oag}mRKABdOponN1m9T^>{hVi`IFI7}u
z*KpQpaq6$c(V0(<El&NlIQ7@!<k;fWUyD<JEzbKZacaKn^Lwdhzki97UyGApi<4iA
zlV6K-eipjDKWZoWf6?G$u@=XFi{rn=@!#V3?{s_rBWctZ=eqQM@SQkw{d{~U&RO#u
z--&aUJjZw9^mxyy8+hs)o};JvoH5TsU(|ehKq)_T=CeN~j-KM*)3cAyzQLJWnvVu&
zUWuc_*}D=)hqHGjPR@xF%ll&<oV~p{e;)eRp?VZN??2=;P_?g#p%XJ|CpMC%uQ#-D
z-{<miD}}ieY1C6bZYqr$Lc{AwRmvLdJ7d%Oku3tFrgUA(b~Z0E#-E-}IFcFb43D*#
zuv$!5EhahEV!~=M)83SPvPZR;uv$!5%_n<YiwUd6g!!1%(9k+t7yGVfZr)we_oZLx
z`(>}s^*OQUwk=(c_U`Rd`+4;F>g$)s_F*);`t$L9m>=t_vptRb_V@SIvPKp`Gdm08
z;&1c9W_>(j@~*j-K2$k9PjwLeMIDX2{CG6_q1Vx<MX#f!+Rfvmv8R4K8vV}eX#9?N
z9gW{VucOfyy^cmd^g0^*>vc5xqu0^si(U`CvY=C2<nPBP&Fg$mzZLnup`{+4>u8*R
z9|!H`Z^pv-KZoS&zrE7?k9DIC4p(iY8c00W-?Y%*rlEHblJ(O#&al@wgI?ndd5yE<
zwT(=RUOPMJHOAso*BKu2UPuidA0IzUc_c>PsxiF76z<kMa;VKCml~sIN00MceHkw`
shL;+{OJp(sJa@c!7Hg)nEiuk4*Rp0h+wAq%4}bhyzRMG1?>U?Q0i}maxBvhE

literal 0
HcmV?d00001

diff --git a/audio/tegu/tuning/spatializer/mode_2_ch b/audio/tegu/tuning/spatializer/mode_2_ch
new file mode 100644
index 0000000000000000000000000000000000000000..470c56cfb061951dd4509b49cfaa8391751f1c52
GIT binary patch
literal 916
zcmZ`%Jxjzu5S@JMdFlmH93pDvR~sx36A^9v0k$^F`7crl7Iro#f>zquoQS1Z@BIS{
zOMifsc;cJvE`;6O!eln{Uf#UjNlHY0L`Vf?XIEov>*c9brN~``M+pVMx!$aWEwxDN
zG<k7LEorHBT51c8T891sm9-aaDbIJ_jVFV#C&ngn_rS)CHz6MOZOnKS;@8nMUMKR$
z(d2sx>V7AVCVQEMv6opGdr_Di*gn~djhPuP0^_q^+<KUq$~=b+M2s0T?qkm@REZ*;
znYW6FsHC3OVT~^|J9^1U2=Qlg80WQ(xb7d~`4-w7)9)N;vA5*s`MCavn!Wfuygnh=
zJG~?+yS}Ys{BD8#x)y<1IeyGpRzS|4j+x`xI<aa+A0U5EpJ^yIonDFN+|3gWI*)j(
qrnb(U=G-qUotx3f@q^Ea&tI%74*t9P>}p;mrTU(SLIix5oc{qUB7Cs`

literal 0
HcmV?d00001

diff --git a/audio/tegu/tuning/spatializer/mode_6_ch b/audio/tegu/tuning/spatializer/mode_6_ch
new file mode 100644
index 0000000000000000000000000000000000000000..94ec6356a9895665cd1dde568bbc5282d341ac0a
GIT binary patch
literal 784
zcmZ`%J5Iwu6deDE2u5HjMGB<c03oHILc}yQxde^RkqdB#R4Hk=fJ2Fb#1S}0gb*|P
zY{`1wthC<s%zJNU_iY7W&Y5F{*~{xYw_zl<Y$~oLXMzbb^1_E$9>IzTb{4@V5o{X4
zE(X|)`Wb3SBj+C2JocV?PCmsn&F9{8@+<D^@LhXOH7##9sww}*{eJj7ox^G#pFAfo
zS<qXLYRbzgPF_xN@?zZK!RyJ3=kBOKWq&Wpna`5_)E$&axz6u1_TT=CZdH$OI1AqO
zb(g1{BPZ`%pVY^Q*I2XIav7u&A0s`D)k6Jgn9_##G}MxRji1{-2BSLGdtiG7ygk>9
cZvVX2IZ^2;rt=)?*n6*0b?0JkYTn!QA9vGakpKVy

literal 0
HcmV?d00001

diff --git a/audio/tegu/tuning/spatializer/mode_xaural b/audio/tegu/tuning/spatializer/mode_xaural
new file mode 100644
index 0000000000000000000000000000000000000000..b3a3a962e37c8aca8a8d1710f622c24f28343c56
GIT binary patch
literal 32
dcmWe+U|^5{VipDm29d<x%|IpyG%!MF1^_MC0;B){

literal 0
HcmV?d00001

diff --git a/device-tegu.mk b/device-tegu.mk
index a277c06..2a5fca7 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -119,7 +119,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.bluetooth.a2dp_offload.supported=true \
     persist.bluetooth.a2dp_offload.disabled=false \
-    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
 # POF
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -149,10 +149,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
-# Spatial Audio
-PRODUCT_PACKAGES += \
-	libspatialaudio \
-	librondo
+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.audio.spatializer_enabled=true
+
+# declare use of stereo spatialization
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.audio.stereo_spatialization_enabled=true
 
 # Sound Dose
 PRODUCT_PACKAGES += \