From 0c4bf1f199876776eab0fd7022e3bd613bce86ef Mon Sep 17 00:00:00 2001
From: yixuanjiang <yixuanjiang@google.com>
Date: Mon, 18 Dec 2023 16:10:27 +0800
Subject: [PATCH 1/2] aoc: update mixer table for voice capture

Currently AoC always use 3ch in voice usecase
rather than using mic MAX microphone as ch count.
Modify the mask to map voice request

Bug: 316603846
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b5717fde2c2b54b93c7b6f76ad1dd922b3089bb)
Merged-In: Idf92d1da0df632c6410d30147725857e55cef70b
Change-Id: Idf92d1da0df632c6410d30147725857e55cef70b
---
 audio/akita/config/mixer_paths.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/audio/akita/config/mixer_paths.xml b/audio/akita/config/mixer_paths.xml
index 09c9c41..fce9827 100644
--- a/audio/akita/config/mixer_paths.xml
+++ b/audio/akita/config/mixer_paths.xml
@@ -760,8 +760,8 @@
 
     <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" 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"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
@@ -786,8 +786,8 @@
 
     <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" 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"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
@@ -812,8 +812,8 @@
 
     <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" 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"/>
         <ctl name="MIC DC Blocker" value="1"/>
     </path>
@@ -825,8 +825,8 @@
     <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" 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"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="Audio Capture Mic Source" value="ERASER"/>

From c813b98e72a8804d7c020244d4d49a40345e4dbb Mon Sep 17 00:00:00 2001
From: yixuanjiang <yixuanjiang@google.com>
Date: Mon, 18 Dec 2023 19:53:29 +0800
Subject: [PATCH 2/2] aoc: update mixer table for voice capture V2

Currently AoC always use 3ch in voice usecase
rather than using mic MAX microphone as ch count.
Modify the mask to map voice request

Bug: 316603846
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f4a88d3a7d532d3d0b90bda92c6a03cb587e64a)
Merged-In: Id61e5ab635e612acd9a359578ec8771a1ce00cde
Change-Id: Id61e5ab635e612acd9a359578ec8771a1ce00cde
---
 audio/akita/config/mixer_paths.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/akita/config/mixer_paths.xml b/audio/akita/config/mixer_paths.xml
index fce9827..c49c9df 100644
--- a/audio/akita/config/mixer_paths.xml
+++ b/audio/akita/config/mixer_paths.xml
@@ -812,8 +812,8 @@
 
     <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="3"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="2"/>
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
     </path>
@@ -825,8 +825,8 @@
     <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="1" value="2"/>
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <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"/>