From d0104cfd0d5a81d2bec523892c4fd43dbe926e86 Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Tue, 4 Jan 2022 21:20:33 +0800
Subject: [PATCH] audio: syncing the USB config for mfg

currently mfg audio tool using audio-recordC usb-headset-mic
in mixer_paths.xml, add a new path for mfg usb recording to
switching the usb mic source

modify the usb alsa control to v2 since the latest alsa control
already changed

Bug: 213027646
Test: verify pass with mfg tool usb-record
Signed-off-by: vincenttew <vincenttew@google.com>
Change-Id: If3af632ed2bddcdd1329f17fc89ea82162d810ae
---
 audio/oriole/config/mixer_paths_factory.xml | 27 ++++++++++++++++-----
 audio/raven/config/mixer_paths_factory.xml  | 27 ++++++++++++++++-----
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index 57633f5..3326db7 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -36,6 +36,14 @@
         <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
     </path>
 
+    <path name="mfg-record usb-headset-mic">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
     <path name="mic1-status">
         <ctl name="MIC0" value="1" />
     </path>
@@ -233,12 +241,13 @@
     </path>
 
     <path name="mfg-playback usb-headphones">
-        <ctl name="USB Dev ID" value="1" />
-        <ctl name="USB Playback EP ID" value="1" />
-        <ctl name="USB Playback SR" value="48000" />
-        <ctl name="USB Playback CH" value="2" />
-        <ctl name="USB Playback BW" value="16" />
-        <ctl name="USB Config To AoC" 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="6" />
+        <ctl name="USB Playback SR v2" value="48000" />
+        <ctl name="USB Playback CH v2" value="2" />
+        <ctl name="USB Playback BW v2" value="16" />
+        <ctl name="USB Config To AoC v2" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
@@ -300,9 +309,15 @@
     </path>
 
     <path name="loopback-usb-mic-speaker">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <path name="loopback-usb-mic-usb-headphone">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <pcm_id name="loopback-mic1" value="EP1 capture (*)"/>
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index 57633f5..3326db7 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -36,6 +36,14 @@
         <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
     </path>
 
+    <path name="mfg-record usb-headset-mic">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
     <path name="mic1-status">
         <ctl name="MIC0" value="1" />
     </path>
@@ -233,12 +241,13 @@
     </path>
 
     <path name="mfg-playback usb-headphones">
-        <ctl name="USB Dev ID" value="1" />
-        <ctl name="USB Playback EP ID" value="1" />
-        <ctl name="USB Playback SR" value="48000" />
-        <ctl name="USB Playback CH" value="2" />
-        <ctl name="USB Playback BW" value="16" />
-        <ctl name="USB Config To AoC" 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="6" />
+        <ctl name="USB Playback SR v2" value="48000" />
+        <ctl name="USB Playback CH v2" value="2" />
+        <ctl name="USB Playback BW v2" value="16" />
+        <ctl name="USB Config To AoC v2" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
@@ -300,9 +309,15 @@
     </path>
 
     <path name="loopback-usb-mic-speaker">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <path name="loopback-usb-mic-usb-headphone">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <pcm_id name="loopback-mic1" value="EP1 capture (*)"/>