From 7c61e4166ebcad664091469b783bfe4f2d8f33d9 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Fri, 1 Apr 2022 04:28:22 +0000
Subject: [PATCH 1/2] audio: sync mixer table for Eraser capture

Bug: 227697054
Test: build pass and pts-audio.
Change-Id: Id0384c7af546dec1a6237e3091a366a85d097d26
---
 audio/cheetah/config/mixer_paths.xml     | 15 +++++++++++++++
 audio/cloudripper/config/mixer_paths.xml | 17 ++++++++++++++++-
 audio/panther/config/mixer_paths.xml     | 15 +++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml
index 0063f1d..8700ec7 100644
--- a/audio/cheetah/config/mixer_paths.xml
+++ b/audio/cheetah/config/mixer_paths.xml
@@ -242,6 +242,7 @@
     <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"/>
 
     <!-- audio PDM mic default state -->
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
@@ -730,6 +731,20 @@
         <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
+    <path name="voice-recog-aec-mic">
+        <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"/>
+        <ctl name="MIC DC Blocker" value="1"/>
+        <ctl name="Audio Capture Mic Source" value="ERASER"/>
+    </path>
+
+    <path name="voice-recog-aec-mic-post">
+        <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"/>
diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml
index 2a1e039..76a79b0 100644
--- a/audio/cloudripper/config/mixer_paths.xml
+++ b/audio/cloudripper/config/mixer_paths.xml
@@ -244,6 +244,7 @@
     <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"/>
 
     <!-- audio PDM mic default state -->
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
@@ -735,12 +736,26 @@
         <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
-    <path name="unprocessed-mic">
+    <path name="voice-recog-aec-mic">
+        <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>
+
+    <path name="voice-recog-aec-mic-post">
+        <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"/>
     </path>
 
     <path name="unprocessed-mic-post">
diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml
index 0063f1d..8700ec7 100644
--- a/audio/panther/config/mixer_paths.xml
+++ b/audio/panther/config/mixer_paths.xml
@@ -242,6 +242,7 @@
     <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"/>
 
     <!-- audio PDM mic default state -->
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
@@ -730,6 +731,20 @@
         <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
+    <path name="voice-recog-aec-mic">
+        <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"/>
+        <ctl name="MIC DC Blocker" value="1"/>
+        <ctl name="Audio Capture Mic Source" value="ERASER"/>
+    </path>
+
+    <path name="voice-recog-aec-mic-post">
+        <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"/>

From 9b7f753e570e36374f127acdb647e5f6bab922a7 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Fri, 1 Apr 2022 07:37:43 +0000
Subject: [PATCH 2/2] audio: add immersive playback support

Bug: 227697054
Test: build pass and pts-audio
Change-Id: Iccb1953def4a9dffaf7b9e3dd512c68ae8a37c1e
---
 audio/cheetah/config/mixer_paths.xml     | 12 ++++++++++++
 audio/cloudripper/config/mixer_paths.xml | 12 ++++++++++++
 audio/panther/config/mixer_paths.xml     | 12 ++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml
index 8700ec7..b268f0f 100644
--- a/audio/cheetah/config/mixer_paths.xml
+++ b/audio/cheetah/config/mixer_paths.xml
@@ -431,6 +431,18 @@
         <path name="compress-offload-playback" />
     </path>
 
+    <path name="immersive-playbackP">
+        <ctl name="TDM_0_RX Mixer EP4" value="1"/>
+    </path>
+
+    <path name="immersive-playbackP bt">
+        <ctl name="BT_RX Mixer EP4" value="1"/>
+    </path>
+
+    <path name="immersive-playbackP usb-headphone">
+        <ctl name="USB_RX Mixer EP4" value="1"/>
+    </path>
+
     <path name="voip-playbackP">
         <ctl name="TDM_0_RX Mixer VOIP" value="1"/>
     </path>
diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml
index 76a79b0..c39cbfa 100644
--- a/audio/cloudripper/config/mixer_paths.xml
+++ b/audio/cloudripper/config/mixer_paths.xml
@@ -433,6 +433,18 @@
         <path name="compress-offload-playback" />
     </path>
 
+    <path name="immersive-playbackP">
+        <ctl name="TDM_0_RX Mixer EP4" value="1"/>
+    </path>
+
+    <path name="immersive-playbackP bt">
+        <ctl name="BT_RX Mixer EP4" value="1"/>
+    </path>
+
+    <path name="immersive-playbackP usb-headphone">
+        <ctl name="USB_RX Mixer EP4" value="1"/>
+    </path>
+
     <path name="voip-playbackP">
         <ctl name="TDM_0_RX Mixer VOIP" value="1"/>
     </path>
diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml
index 8700ec7..b268f0f 100644
--- a/audio/panther/config/mixer_paths.xml
+++ b/audio/panther/config/mixer_paths.xml
@@ -431,6 +431,18 @@
         <path name="compress-offload-playback" />
     </path>
 
+    <path name="immersive-playbackP">
+        <ctl name="TDM_0_RX Mixer EP4" value="1"/>
+    </path>
+
+    <path name="immersive-playbackP bt">
+        <ctl name="BT_RX Mixer EP4" value="1"/>
+    </path>
+
+    <path name="immersive-playbackP usb-headphone">
+        <ctl name="USB_RX Mixer EP4" value="1"/>
+    </path>
+
     <path name="voip-playbackP">
         <ctl name="TDM_0_RX Mixer VOIP" value="1"/>
     </path>