From 9790519457ad79f83edefd29524a5356f3501663 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Fri, 19 Jan 2024 17:46:21 +0800
Subject: [PATCH] audio: add offloaded spatializer use case

Bug: 307842941
Test: n/a
Change-Id: I072f7642baea2c7b32bca7eba31cdbe4a82cd3b4
---
 audio/caiman/aidl_config/mixer_paths_aidl.xml | 66 ++++++++++++++++---
 audio/komodo/aidl_config/mixer_paths_aidl.xml | 66 ++++++++++++++++---
 audio/tokay/aidl_config/mixer_paths_aidl.xml  | 66 ++++++++++++++++---
 3 files changed, 171 insertions(+), 27 deletions(-)

diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml
index 8067a9df..1057e88b 100644
--- a/audio/caiman/aidl_config/mixer_paths_aidl.xml
+++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml
@@ -854,6 +854,58 @@
     <path name="immersive-playback-0 -> usb" />
   </path>
 
+  <path name="immersive-offloaded-spatializer-playback -> speaker">
+    <ctl name="TDM_0_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback -> bt">
+    <ctl name="BT_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-headset">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb">
+    <ctl name="USB_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-headset">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1014,14 +1066,11 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-tap-capture-0" />
 
-  <path name="microphones -> hotword-lookback-capture-0">
-  </path>
+  <path name="microphones -> hotword-lookback-capture-0" />
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1195,7 +1244,6 @@
   <path name="speaker (VOICE)">
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
@@ -1424,8 +1472,8 @@
   </path>
 
   <path name="adapted-voice-earpiece">
-      <ctl name="Boost Peak Current Limit" value="3.50A" />
-      <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Digital PCM Volume" value="817" />
   </path>
   <path name="adapted-voice-earpiece-battery-throttled">
     <path name="adapted-voice-earpiece" />
diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml
index 8067a9df..1057e88b 100644
--- a/audio/komodo/aidl_config/mixer_paths_aidl.xml
+++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml
@@ -854,6 +854,58 @@
     <path name="immersive-playback-0 -> usb" />
   </path>
 
+  <path name="immersive-offloaded-spatializer-playback -> speaker">
+    <ctl name="TDM_0_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback -> bt">
+    <ctl name="BT_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-headset">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb">
+    <ctl name="USB_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-headset">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1014,14 +1066,11 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-tap-capture-0" />
 
-  <path name="microphones -> hotword-lookback-capture-0">
-  </path>
+  <path name="microphones -> hotword-lookback-capture-0" />
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1195,7 +1244,6 @@
   <path name="speaker (VOICE)">
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
@@ -1424,8 +1472,8 @@
   </path>
 
   <path name="adapted-voice-earpiece">
-      <ctl name="Boost Peak Current Limit" value="3.50A" />
-      <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Digital PCM Volume" value="817" />
   </path>
   <path name="adapted-voice-earpiece-battery-throttled">
     <path name="adapted-voice-earpiece" />
diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml
index 8067a9df..1057e88b 100644
--- a/audio/tokay/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml
@@ -854,6 +854,58 @@
     <path name="immersive-playback-0 -> usb" />
   </path>
 
+  <path name="immersive-offloaded-spatializer-playback -> speaker">
+    <ctl name="TDM_0_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
+    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback -> bt">
+    <ctl name="BT_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-headset">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb">
+    <ctl name="USB_RX Mixer EP4" value="1" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-headset">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
+    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1014,14 +1066,11 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0">
-  </path>
+  <path name="microphones -> sound-trigger-tap-capture-0" />
 
-  <path name="microphones -> hotword-lookback-capture-0">
-  </path>
+  <path name="microphones -> hotword-lookback-capture-0" />
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1195,7 +1244,6 @@
   <path name="speaker (VOICE)">
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
@@ -1424,8 +1472,8 @@
   </path>
 
   <path name="adapted-voice-earpiece">
-      <ctl name="Boost Peak Current Limit" value="3.50A" />
-      <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Digital PCM Volume" value="817" />
   </path>
   <path name="adapted-voice-earpiece-battery-throttled">
     <path name="adapted-voice-earpiece" />