From 1664b2e5d785213c7d2a211a1f5c0b591a17be85 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Tue, 23 Jan 2024 16:13:02 +0800
Subject: [PATCH] audio: align mixer paths and add missing paths

 - add controls
     "HAC AMP EN",
     "EP5 TX Mixer INTERNAL_MIC_US_TX"
     "BUILDIN US MIC ID CAPTURE LIST"
 - add paths
     "builtin-mic-id-capture-list"
     "microphones (UNPROCESSED)"
     "back-microphones (UNPROCESSED)"
     "ultrasound-microphones"
 - move the mic id list to a path and other microphones devices use the
   path.

Bug: 301535551
Test: manually test
Change-Id: I7dd019f54b3519130e1fffd272e9c698fd4e4281
---
 audio/comet/aidl_config/mixer_paths_aidl.xml | 269 +++++++++++--------
 1 file changed, 158 insertions(+), 111 deletions(-)

diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index 85768f9..4cfc807 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -116,6 +116,9 @@
   <ctl name="R Fast Use Case Switch Enable" value="0" />
   <ctl name="R Fast Use Case Delta File" value="fast_switch3.txt" />
 
+  <!-- HAC Max Amp switch init -->
+  <ctl name="HAC AMP EN" value="0" />
+
   <!-- default EP volume -->
   <ctl name="PCM Playback Switch" value="1" />
   <ctl name="PCM Playback Volume" value="10" />
@@ -233,6 +236,7 @@
   <ctl name="EP6 TX Mixer INCALL_TX" value="0" />
   <ctl name="NoHost1 TX Mixer INCALL_TX" value="0" />
 
+  <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0" />
   <ctl name="EP4 TX Mixer I2S_2_TX" value="0" />
 
   <!-- AoC Mic setting -->
@@ -241,7 +245,7 @@
   <ctl name="MIC Record Soft Gain (dB)" value="-40" />
 
   <!-- USB setting v2 -->
-  <ctl name="USB Bus ID v2" value="2" />
+  <ctl name="USB Bus ID v2" value="1" />
   <ctl name="USB Dev ID v2" value="2" />
   <ctl name="USB Playback EP ID v2" value="1" />
   <ctl name="USB Playback FORMAT v2" value="0" />
@@ -267,6 +271,12 @@
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
   <ctl name="Audio Capture Mic Source" value="Builtin_MIC" />
 
+  <!-- audio Ultrasound mic default state -->
+  <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="-1" />
+  <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
+  <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
+  <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
+
   <!-- sidetone controls -->
   <ctl name="Sidetone Enable" value="0" />
   <ctl name="Sidetone Volume" value="-96" />
@@ -317,7 +327,6 @@
   <ctl name="Decoder Reference Enable" value="0" />
   <ctl name="LVM Enable" value="0" />
 
-  <ctl name="AoC Chirp Enable" value="0" />
   <!-- sidetone dynamic control -->
   <path name="sidetone-for handset">
     <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -842,6 +851,14 @@
     <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>
@@ -854,6 +871,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,13 +1083,42 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0">
+  <path name="microphones -> sound-trigger-capture-0" />
+
+  <path name="microphones -> sound-trigger-tap-capture-0" />
+
+  <path name="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 -> sound-trigger-tap-capture-0">
+  <path name="microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="microphones -> hotword-lookback-capture-0">
+  <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 -->
@@ -1120,6 +1218,10 @@
     <ctl name="Incall Capture Stream0" value="UL_DL" />
   </path>
 
+  <path name="telephony-rx -> 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>
@@ -1132,6 +1234,10 @@
     <ctl name="Incall Capture Stream1" value="UL_DL" />
   </path>
 
+  <path name="telephony-rx -> 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>
@@ -1144,28 +1250,8 @@
     <ctl name="Incall Capture Stream2" value="UL_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 name="telephony-rx -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="DL" />
   </path>
 
   <!-- codec setting -->
@@ -1180,7 +1266,13 @@
     <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-earpiece (VOICE,HAC)">
+    <ctl name="PCM Source" value="ASP" />
+    <ctl name="AMP PCM Gain" value="10" />
+    <ctl name="Main AMP Enable Switch" value="1" />
+    <ctl name="HAC AMP EN" value="1" />
   </path>
 
   <path name="speaker">
@@ -1195,13 +1287,12 @@
   <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 -->
-    <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
+    <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_switch4.txt" />
+    <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
     <ctl name="R Fast Use Case Switch Enable" value="1" />
   </path>
 
@@ -1213,30 +1304,29 @@
   </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 Spatial Module Enable" value="1" />
     <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_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>
@@ -1248,91 +1338,51 @@
   </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">
+  <path name="microphones (CAMCORDER)">
+    <path name="builtin-mic-id-capture-list" />
     <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="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>
-
-  <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="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 name="back-microphones (UNPROCESSED)">
+    <path name="microphones (UNPROCESSED)" />
   </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="ultrasound-microphones">
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1" />
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
   </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" />
@@ -1343,10 +1393,7 @@
   </path>
 
   <path name="usb-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="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
@@ -1424,8 +1471,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" />