From 29af2213b34ee2a9a22e86ea10ad5b721658c096 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Thu, 29 Aug 2024 09:48:19 +0000
Subject: [PATCH] audio: update AIDL configs and add spatializer configs

Bug: 362904466
Test: mm
Flag: build.RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA
Change-Id: I24d380399882023a63d8c651bad3fee2eb4f8240
---
 .../audio_platform_configuration.xml          |  19 +-
 audio/husky/aidl_config/mixer_paths_aidl.xml  | 424 +++++++++---------
 audio/husky/audio-tables.mk                   |  10 +
 audio/husky/tuning/spatializer/base           | Bin 0 -> 3912 bytes
 audio/husky/tuning/spatializer/mode_2_ch      | Bin 0 -> 916 bytes
 audio/husky/tuning/spatializer/mode_6_ch      | Bin 0 -> 784 bytes
 audio/husky/tuning/spatializer/mode_xaural    | Bin 0 -> 32 bytes
 .../audio_platform_configuration.xml          |  19 +-
 audio/shiba/aidl_config/mixer_paths_aidl.xml  | 424 +++++++++---------
 audio/shiba/audio-tables.mk                   |  10 +
 audio/shiba/tuning/spatializer/base           | Bin 0 -> 3912 bytes
 audio/shiba/tuning/spatializer/mode_2_ch      | Bin 0 -> 916 bytes
 audio/shiba/tuning/spatializer/mode_6_ch      | Bin 0 -> 784 bytes
 audio/shiba/tuning/spatializer/mode_xaural    | Bin 0 -> 32 bytes
 device-husky.mk                               |  20 +-
 device-shiba.mk                               |  20 +-
 16 files changed, 496 insertions(+), 450 deletions(-)
 create mode 100644 audio/husky/tuning/spatializer/base
 create mode 100644 audio/husky/tuning/spatializer/mode_2_ch
 create mode 100644 audio/husky/tuning/spatializer/mode_6_ch
 create mode 100644 audio/husky/tuning/spatializer/mode_xaural
 create mode 100644 audio/shiba/tuning/spatializer/base
 create mode 100644 audio/shiba/tuning/spatializer/mode_2_ch
 create mode 100644 audio/shiba/tuning/spatializer/mode_6_ch
 create mode 100644 audio/shiba/tuning/spatializer/mode_xaural

diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml
index 4b747bb..b34566d 100644
--- a/audio/husky/aidl_config/audio_platform_configuration.xml
+++ b/audio/husky/aidl_config/audio_platform_configuration.xml
@@ -24,10 +24,13 @@
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
-      <argument name="ThrottlingSeverity" value="MODERATE" />
+      <argument name="ThrottlingSeverity" value="LIGHT" />
     </feature>
     <feature name="RuntimeTuningDump" />
-    <!-- <feature name="spatializer-offload" /> -->
+    <feature name="SoundDose">
+      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
+    </feature>
+    <feature name="spatializer-offload" />
   </features>
 
   <voipVolume>
@@ -47,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
@@ -58,11 +60,12 @@
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
     </tuner>
     <tuner type="telephony" name="fortemedia">
-      <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
+      <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
       <argument name="VoIP_Rate" value="32000" />
       <argument name="BOOST_USB_SWB_CLK" value="y" />
       <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
+      <argument name="MCPS_TABLE" value="y" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
   </tuners>
@@ -71,8 +74,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -89,18 +92,18 @@
     <latency source="microphones" sink="primary-capture" milliseconds="160" />
     <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
     <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 
diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index 9695f70..9c8ccf6 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -256,10 +256,14 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
   <ctl name="Hotword Tap Enable" value="0" />
 
+  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
+  <!-- crashing since speicifc order is needed between dsp mode and"        -->
+  <!-- spatial module."                                                     -->
+  <ctl name="Mic Spatial Module Enable" value="0" />
+
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@@ -307,6 +311,7 @@
   <ctl name="Incall Capture Stream0" value="Off" />
   <ctl name="Incall Capture Stream1" value="Off" />
   <ctl name="Incall Capture Stream2" value="Off" />
+  <ctl name="Incall Capture Stream3" value="Off" />
 
   <!-- These two controls control the muting function of mics and sinks during the voice call. -->
   <!-- They would be enabled by HAL. -->
@@ -413,6 +418,10 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -485,6 +494,10 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -557,6 +570,10 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -634,6 +651,10 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -706,6 +727,10 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -790,6 +815,10 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -806,61 +835,6 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-earpiece">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-safe">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback -> bt">
-    <ctl name="BT_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> bt">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb">
-    <ctl name="USB_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-headset">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-device">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
 
   <path name="spatializer-offload-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP4" value="1" />
@@ -882,6 +856,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>
@@ -902,6 +888,10 @@
     <path name="spatializer-offload-playback -> bt" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
@@ -972,6 +962,10 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1046,6 +1040,39 @@
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -1074,11 +1101,47 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
 
-  <path name="microphones -> hotword-lookback-capture-0" />
+  <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
+
+  <path name="ultrasound-microphones -> ultrasound-capture-0">
+    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
+  </path>
+
+  <path name="microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> mmap-capture-0">
+    <path name="microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1113,6 +1176,10 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
@@ -1165,77 +1232,9 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="usb-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
+  <path name="in-call-capture-source-0 -> in-call-capture-0" />
+  <path name="in-call-capture-source-1 -> in-call-capture-1" />
+  <path name="in-call-capture-source-2 -> in-call-capture-2" />
 
   <!-- codec setting -->
   <!-- Rx device -->
@@ -1249,7 +1248,6 @@
     <ctl name="PCM Source" value="ASP" />
     <ctl name="AMP PCM Gain" value="7" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <ctl name="AoC Chirp Enable" value="1" />
   </path>
 
   <path name="speaker">
@@ -1266,7 +1264,6 @@
     <ctl name="R ASPTX1 Slot Position" value="0" />
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <!-- load Enable FIR -->
     <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
@@ -1275,36 +1272,35 @@
 
   <path name="speaker-safe">
     <ctl name="R Main AMP Enable Switch" value="1" />
-    <!-- load Bypass FIR -->
-    <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
   </path>
 
   <!-- Tx device -->
-  <path name="microphones">
+  <path name="builtin-mic-id-capture-list">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+  </path>
+
+  <path name="microphones">
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
   <path name="microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
@@ -1316,91 +1312,47 @@
   </path>
 
   <path name="microphones (SOUND_TRIGGER_AEC)">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="Audio Capture Eraser Enable" value="1" />
     <ctl name="Audio Capture Mic Source" value="ERASER" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="back-microphones">
-    <ctl name="Mic Spatial Module Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+  <path name="microphones (CAMCORDER)">
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="22" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
+  <path name="microphones (UNPROCESSED)">
+    <path name="builtin-mic-id-capture-list" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="5" />
+  </path>
+
+  <path name="back-microphones">
+    <path name="microphones" />
   </path>
 
   <path name="back-microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    <path name="microphones (VOICE)" />
   </path>
 
-  <path name="microphones (CAMCORDER)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
   </path>
 
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>
 
-  <path name="camcorder-mic">
-    <ctl name="Mic Spatial Module Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
-  <path name="unprocessed-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
-  </path>
-
-  <path name="unprocessed-dual-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
-  </path>
-
-  <path name="unprocessed-triple-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
+  <path name="back-microphones (UNPROCESSED)">
+    <path name="microphones (UNPROCESSED)" />
   </path>
 
   <path name="bluetooth-sco-headset-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="Audio Capture Mic Source" value="BT_MIC" />
     <ctl name="Voice Call Mic Source" value="BT_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
@@ -1411,9 +1363,7 @@
   </path>
 
   <path name="usb-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
@@ -1428,6 +1378,54 @@
     <path name="usb-microphones" />
   </path>
 
+  <path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-0">
+    <path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-1">
+    <path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-2">
+    <path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->
diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk
index 1506b4e..0929972 100644
--- a/audio/husky/audio-tables.mk
+++ b/audio/husky/audio-tables.mk
@@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \
     device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
 
 endif
+
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# Offload spatializer config
+PRODUCT_COPY_FILES += \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
+
+endif
diff --git a/audio/husky/tuning/spatializer/base b/audio/husky/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/husky/tuning/spatializer/mode_2_ch b/audio/husky/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/husky/tuning/spatializer/mode_6_ch b/audio/husky/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/husky/tuning/spatializer/mode_xaural b/audio/husky/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/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml
index 4b747bb..b34566d 100644
--- a/audio/shiba/aidl_config/audio_platform_configuration.xml
+++ b/audio/shiba/aidl_config/audio_platform_configuration.xml
@@ -24,10 +24,13 @@
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
-      <argument name="ThrottlingSeverity" value="MODERATE" />
+      <argument name="ThrottlingSeverity" value="LIGHT" />
     </feature>
     <feature name="RuntimeTuningDump" />
-    <!-- <feature name="spatializer-offload" /> -->
+    <feature name="SoundDose">
+      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
+    </feature>
+    <feature name="spatializer-offload" />
   </features>
 
   <voipVolume>
@@ -47,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
@@ -58,11 +60,12 @@
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
     </tuner>
     <tuner type="telephony" name="fortemedia">
-      <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
+      <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
       <argument name="VoIP_Rate" value="32000" />
       <argument name="BOOST_USB_SWB_CLK" value="y" />
       <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
+      <argument name="MCPS_TABLE" value="y" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
   </tuners>
@@ -71,8 +74,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -89,18 +92,18 @@
     <latency source="microphones" sink="primary-capture" milliseconds="160" />
     <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
     <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index 9695f70..9c8ccf6 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -256,10 +256,14 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
   <ctl name="Hotword Tap Enable" value="0" />
 
+  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
+  <!-- crashing since speicifc order is needed between dsp mode and"        -->
+  <!-- spatial module."                                                     -->
+  <ctl name="Mic Spatial Module Enable" value="0" />
+
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@@ -307,6 +311,7 @@
   <ctl name="Incall Capture Stream0" value="Off" />
   <ctl name="Incall Capture Stream1" value="Off" />
   <ctl name="Incall Capture Stream2" value="Off" />
+  <ctl name="Incall Capture Stream3" value="Off" />
 
   <!-- These two controls control the muting function of mics and sinks during the voice call. -->
   <!-- They would be enabled by HAL. -->
@@ -413,6 +418,10 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -485,6 +494,10 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -557,6 +570,10 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -634,6 +651,10 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -706,6 +727,10 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -790,6 +815,10 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -806,61 +835,6 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-earpiece">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-safe">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback -> bt">
-    <ctl name="BT_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> bt">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb">
-    <ctl name="USB_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-headset">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-device">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
 
   <path name="spatializer-offload-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP4" value="1" />
@@ -882,6 +856,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>
@@ -902,6 +888,10 @@
     <path name="spatializer-offload-playback -> bt" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
@@ -972,6 +962,10 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1046,6 +1040,39 @@
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -1074,11 +1101,47 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
 
-  <path name="microphones -> hotword-lookback-capture-0" />
+  <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
+
+  <path name="ultrasound-microphones -> ultrasound-capture-0">
+    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
+  </path>
+
+  <path name="microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> mmap-capture-0">
+    <path name="microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1113,6 +1176,10 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
@@ -1165,77 +1232,9 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="usb-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
+  <path name="in-call-capture-source-0 -> in-call-capture-0" />
+  <path name="in-call-capture-source-1 -> in-call-capture-1" />
+  <path name="in-call-capture-source-2 -> in-call-capture-2" />
 
   <!-- codec setting -->
   <!-- Rx device -->
@@ -1249,7 +1248,6 @@
     <ctl name="PCM Source" value="ASP" />
     <ctl name="AMP PCM Gain" value="7" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <ctl name="AoC Chirp Enable" value="1" />
   </path>
 
   <path name="speaker">
@@ -1266,7 +1264,6 @@
     <ctl name="R ASPTX1 Slot Position" value="0" />
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <!-- load Enable FIR -->
     <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
@@ -1275,36 +1272,35 @@
 
   <path name="speaker-safe">
     <ctl name="R Main AMP Enable Switch" value="1" />
-    <!-- load Bypass FIR -->
-    <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
   </path>
 
   <!-- Tx device -->
-  <path name="microphones">
+  <path name="builtin-mic-id-capture-list">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+  </path>
+
+  <path name="microphones">
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
   <path name="microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
@@ -1316,91 +1312,47 @@
   </path>
 
   <path name="microphones (SOUND_TRIGGER_AEC)">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="Audio Capture Eraser Enable" value="1" />
     <ctl name="Audio Capture Mic Source" value="ERASER" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="back-microphones">
-    <ctl name="Mic Spatial Module Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+  <path name="microphones (CAMCORDER)">
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="22" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
+  <path name="microphones (UNPROCESSED)">
+    <path name="builtin-mic-id-capture-list" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="5" />
+  </path>
+
+  <path name="back-microphones">
+    <path name="microphones" />
   </path>
 
   <path name="back-microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    <path name="microphones (VOICE)" />
   </path>
 
-  <path name="microphones (CAMCORDER)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
   </path>
 
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>
 
-  <path name="camcorder-mic">
-    <ctl name="Mic Spatial Module Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
-  <path name="unprocessed-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
-  </path>
-
-  <path name="unprocessed-dual-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
-  </path>
-
-  <path name="unprocessed-triple-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
+  <path name="back-microphones (UNPROCESSED)">
+    <path name="microphones (UNPROCESSED)" />
   </path>
 
   <path name="bluetooth-sco-headset-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="Audio Capture Mic Source" value="BT_MIC" />
     <ctl name="Voice Call Mic Source" value="BT_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
@@ -1411,9 +1363,7 @@
   </path>
 
   <path name="usb-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
@@ -1428,6 +1378,54 @@
     <path name="usb-microphones" />
   </path>
 
+  <path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-0">
+    <path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-1">
+    <path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-2">
+    <path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->
diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk
index dd809ee..ea4aa77 100644
--- a/audio/shiba/audio-tables.mk
+++ b/audio/shiba/audio-tables.mk
@@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \
     device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
 
 endif
+
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# Offload spatializer config
+PRODUCT_COPY_FILES += \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
+
+endif
diff --git a/audio/shiba/tuning/spatializer/base b/audio/shiba/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/shiba/tuning/spatializer/mode_2_ch b/audio/shiba/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/shiba/tuning/spatializer/mode_6_ch b/audio/shiba/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/shiba/tuning/spatializer/mode_xaural b/audio/shiba/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-husky.mk b/device-husky.mk
index 3954b89..cf48aa0 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -142,19 +142,31 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.finder.supported=true
 
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# AIDL
+
+# declare use of stereo spatialization
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.stereo_spatialization_enabled=true
+
+else
+# HIDL
+
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio
 
-# declare use of spatial audio
-PRODUCT_PROPERTY_OVERRIDES += \
-       ro.audio.spatializer_enabled=true
-
 # Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc
 
+endif
+
+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.spatializer_enabled=true
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
diff --git a/device-shiba.mk b/device-shiba.mk
index 276a933..76b76d4 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -130,19 +130,31 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.finder.supported=true
 
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# AIDL
+
+# declare use of stereo spatialization
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.stereo_spatialization_enabled=true
+
+else
+# HIDL
+
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio
 
-# declare use of spatial audio
-PRODUCT_PROPERTY_OVERRIDES += \
-       ro.audio.spatializer_enabled=true
-
 # Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc
 
+endif
+
+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.spatializer_enabled=true
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false