From 789c561c9fc741a3bca547642abf0fab4f8bffb9 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Fri, 19 Apr 2024 05:13:13 +0800
Subject: [PATCH] audio: change in-call-capture paths and remove unused ctls

Bug: 333840723
Test: python3 dialer-cmd.py callaudio record /data/data/com.google.android.dialer/cache/record-$datetime.pcm
Test: Live caption in dialer
Change-Id: I5d57a5983ead5664a33d6da0c4b5ecc101059ebd
---
 audio/caiman/aidl_config/mixer_paths_aidl.xml | 101 +++++++++---------
 audio/komodo/aidl_config/mixer_paths_aidl.xml | 101 +++++++++---------
 audio/tokay/aidl_config/mixer_paths_aidl.xml  | 101 +++++++++---------
 3 files changed, 153 insertions(+), 150 deletions(-)

diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml
index c8adc9fc..a9881acc 100644
--- a/audio/caiman/aidl_config/mixer_paths_aidl.xml
+++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml
@@ -71,8 +71,6 @@
   <ctl name="R ASPTX4 Slot Position" value="7" />
 
   <!-- Cirrus Booster Amp DRE and VBST config-->
-  <ctl name="VBSTMON Output Switch" value="1" />
-  <ctl name="R VBSTMON Output Switch" value="1" />
   <ctl name="DRE DRE Switch" value="1" />
   <ctl name="R DRE DRE Switch" value="1" />
 
@@ -144,7 +142,6 @@
   <ctl name="TDM_1_RX Mixer EP5" value="0" />
   <ctl name="TDM_1_RX Mixer EP6" value="0" />
   <ctl name="TDM_1_RX Mixer EP7" value="0" />
-  <ctl name="TDM_1_RX Mixer EP8" value="0" />
   <ctl name="TDM_1_RX Mixer NoHost1" value="0" />
 
   <ctl name="USB_RX Mixer EP1" value="0" />
@@ -1226,53 +1223,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 -> 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 -> 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 -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </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 -->
@@ -1419,6 +1372,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/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml
index c8adc9fc..a9881acc 100644
--- a/audio/komodo/aidl_config/mixer_paths_aidl.xml
+++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml
@@ -71,8 +71,6 @@
   <ctl name="R ASPTX4 Slot Position" value="7" />
 
   <!-- Cirrus Booster Amp DRE and VBST config-->
-  <ctl name="VBSTMON Output Switch" value="1" />
-  <ctl name="R VBSTMON Output Switch" value="1" />
   <ctl name="DRE DRE Switch" value="1" />
   <ctl name="R DRE DRE Switch" value="1" />
 
@@ -144,7 +142,6 @@
   <ctl name="TDM_1_RX Mixer EP5" value="0" />
   <ctl name="TDM_1_RX Mixer EP6" value="0" />
   <ctl name="TDM_1_RX Mixer EP7" value="0" />
-  <ctl name="TDM_1_RX Mixer EP8" value="0" />
   <ctl name="TDM_1_RX Mixer NoHost1" value="0" />
 
   <ctl name="USB_RX Mixer EP1" value="0" />
@@ -1226,53 +1223,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 -> 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 -> 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 -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </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 -->
@@ -1419,6 +1372,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/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml
index c8adc9fc..a9881acc 100644
--- a/audio/tokay/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml
@@ -71,8 +71,6 @@
   <ctl name="R ASPTX4 Slot Position" value="7" />
 
   <!-- Cirrus Booster Amp DRE and VBST config-->
-  <ctl name="VBSTMON Output Switch" value="1" />
-  <ctl name="R VBSTMON Output Switch" value="1" />
   <ctl name="DRE DRE Switch" value="1" />
   <ctl name="R DRE DRE Switch" value="1" />
 
@@ -144,7 +142,6 @@
   <ctl name="TDM_1_RX Mixer EP5" value="0" />
   <ctl name="TDM_1_RX Mixer EP6" value="0" />
   <ctl name="TDM_1_RX Mixer EP7" value="0" />
-  <ctl name="TDM_1_RX Mixer EP8" value="0" />
   <ctl name="TDM_1_RX Mixer NoHost1" value="0" />
 
   <ctl name="USB_RX Mixer EP1" value="0" />
@@ -1226,53 +1223,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 -> 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 -> 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 -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </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 -->
@@ -1419,6 +1372,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 -->