From 277d3a9d25d59cbd9dfe36eccfbeb1b7b6b67c97 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Thu, 31 Mar 2022 18:56:54 +0800
Subject: [PATCH] audio: fix PDM mask in mixer_paths.xml

Bug: 227565832
Test: n/a
Change-Id: I49a9bd4607de9ff2a89547b1cbfe2f675f700598
---
 audio/felix/config/mixer_paths.xml         | 67 ++++++----------------
 audio/felix/config/mixer_paths_factory.xml | 30 +---------
 2 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/audio/felix/config/mixer_paths.xml b/audio/felix/config/mixer_paths.xml
index 808e53d..38e180b 100644
--- a/audio/felix/config/mixer_paths.xml
+++ b/audio/felix/config/mixer_paths.xml
@@ -671,13 +671,17 @@
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
-    <!-- Tx device -->
-    <path name="handset-mic">
-        <ctl name="Mic Spatial Module Enable" value="1"/>
+    <path name="builtin-3mics">
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+        <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>
+
+    <!-- Tx device -->
+    <path name="handset-mic">
+        <path name="builtin-3mics" />
+        <ctl name="Mic Spatial Module Enable" value="1"/>
         <ctl name="MIC DC Blocker" value="1"/>
     </path>
 
@@ -686,10 +690,7 @@
     </path>
 
     <path name="voice-handset-mic">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-        <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 name="builtin-3mics" />
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
     </path>
@@ -699,11 +700,8 @@
     </path>
 
     <path name="speaker-mic">
+        <path name="builtin-3mics" />
         <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="1"/>
-        <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"/>
     </path>
 
@@ -712,10 +710,7 @@
     </path>
 
     <path name="voice-speaker-mic">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-        <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 name="builtin-3mics" />
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
     </path>
@@ -725,11 +720,8 @@
     </path>
 
     <path name="camcorder-mic">
+        <path name="builtin-3mics" />
         <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="1"/>
-        <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"/>
     </path>
 
@@ -738,10 +730,7 @@
     </path>
 
     <path name="voice-recog-mic">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-        <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 name="builtin-3mics" />
         <ctl name="MIC DC Blocker" value="1"/>
     </path>
 
@@ -750,11 +739,8 @@
     </path>
 
     <path name="voice-recog-aec-mic">
+        <path name="builtin-3mics" />
         <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="1"/>
-        <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="Audio Capture Mic Source" value="ERASER"/>
     </path>
@@ -764,10 +750,7 @@
     </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="1"/>
-        <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-3mics" />
         <ctl name="MIC DC Blocker" value="1"/>
     </path>
 
@@ -776,10 +759,7 @@
     </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="1"/>
-        <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-3mics" />
         <ctl name="MIC DC Blocker" value="1"/>
     </path>
 
@@ -788,10 +768,7 @@
     </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="1"/>
-        <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-3mics" />
         <ctl name="MIC DC Blocker" value="1"/>
     </path>
 
@@ -800,10 +777,7 @@
     </path>
 
     <path name="bt-mic">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-        <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 name="builtin-3mics" />
         <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
         <ctl name="Voice Call Mic Source" value="BT_MIC"/>
     </path>
@@ -813,10 +787,7 @@
     </path>
 
     <path name="usb-headset-mic">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-        <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 name="builtin-3mics" />
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
         <ctl name="Voice Call Mic Source" value="USB_MIC"/>
     </path>
diff --git a/audio/felix/config/mixer_paths_factory.xml b/audio/felix/config/mixer_paths_factory.xml
index 9bc6171..e1776f4 100644
--- a/audio/felix/config/mixer_paths_factory.xml
+++ b/audio/felix/config/mixer_paths_factory.xml
@@ -11,10 +11,6 @@
 
     <ctl name="EP1 TX Mixer TDM_0_TX" value="0" />
     <ctl name="DEFAULT_MIC_ID" value="0" />
-    <ctl name="MIC0" value="0" />
-    <ctl name="MIC1" value="0" />
-    <ctl name="MIC2" value="0" />
-    <ctl name="MIC3" value="0" />
     <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
 
     <path name="mfg-playback">
@@ -44,19 +40,15 @@
     </path>
 
     <path name="mic1-status">
-        <ctl name="MIC0" value="1" />
     </path>
 
     <path name="mic2-status">
-        <ctl name="MIC1" value="1" />
     </path>
 
     <path name="mic3-status">
-        <ctl name="MIC2" value="1" />
     </path>
 
     <path name="mic4-status">
-        <ctl name="MIC3" value="1" />
     </path>
 
     <path name="mic1-gain">
@@ -104,16 +96,14 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC0" value="1" />
         <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <path name="mic2-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="3" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC1" value="1" />
         <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
@@ -122,28 +112,14 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC2" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic4-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="3" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC3" value="1" />
         <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <path name="mic-all">
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1" />
+        <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="3" />
-        <ctl name="MIC0" value="1" />
-        <ctl name="MIC1" value="1" />
-        <ctl name="MIC2" value="1" />
-        <ctl name="MIC3" value="1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
         <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>