Evolution-X-Tensor/device_google_tangorpro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

aoc: correct capture setting

Browse source 
1. add ultra-sonic capture
2. corret mic2 setting

Test: local
Bug: 237471423
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
Change-Id: If05895eb2574bfdf26d73d371ee634c9f0072bb7
This commit is contained in:
yixuanjiang 2022-06-30 15:47:05 +08:00
parent 10422828f6
commit 445a31fc79
2 changed files with 54 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
audio/tangorpro/config/mixer_paths.xml
View file

@ -747,7 +747,7 @@
<path name="handset-mic"> <path name="handset-mic">
<ctl name="Mic Spatial Module Enable" value="1"/> <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="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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -759,7 +759,7 @@
<path name="voice-handset-mic"> <path name="voice-handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -773,7 +773,7 @@
<path name="speaker-mic"> <path name="speaker-mic">
<ctl name="Mic Spatial Module Enable" value="1"/> <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="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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -785,7 +785,7 @@
<path name="voice-speaker-mic"> <path name="voice-speaker-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -799,7 +799,7 @@
<path name="camcorder-mic"> <path name="camcorder-mic">
<ctl name="Mic Spatial Module Enable" value="1"/> <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="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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -811,7 +811,7 @@
<path name="voice-recog-mic"> <path name="voice-recog-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -824,7 +824,7 @@
<path name="voice-recog-aec-mic"> <path name="voice-recog-aec-mic">
<ctl name="Audio Capture Eraser Enable" value="1"/> <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="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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -837,7 +837,7 @@
<path name="unprocessed-mic"> <path name="unprocessed-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -849,7 +849,7 @@
<path name="unprocessed-dual-mic"> <path name="unprocessed-dual-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -861,7 +861,7 @@
<path name="unprocessed-triple-mic"> <path name="unprocessed-triple-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/> <ctl name="MIC DC Blocker" value="1"/>
@ -873,7 +873,7 @@
<path name="bt-mic"> <path name="bt-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="Audio Capture Mic Source" value="BT_MIC"/> <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
@ -886,7 +886,7 @@
<path name="usb-headset-mic"> <path name="usb-headset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="Audio Capture Mic Source" value="USB_MIC"/> <ctl name="Audio Capture Mic Source" value="USB_MIC"/>

46
audio/tangorpro/config/mixer_paths_factory.xml
View file

@ -12,6 +12,7 @@
<ctl name="MIC Record Soft Gain (dB)" value="0"/> <ctl name="MIC Record Soft Gain (dB)" value="0"/>
<ctl name="EP1 TX Mixer TDM_0_TX" value="0" /> <ctl name="EP1 TX Mixer TDM_0_TX" value="0" />
<ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0" />
<ctl name="DEFAULT_MIC_ID" value="0" /> <ctl name="DEFAULT_MIC_ID" value="0" />
<ctl name="MIC0" value="0" /> <ctl name="MIC0" value="0" />
<ctl name="MIC1" value="0" /> <ctl name="MIC1" value="0" />
@ -45,8 +46,7 @@
</path> </path>
<path name="us-mfg-record"> <path name="us-mfg-record">
<ctl name="US Record Enable" value="1" /> <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
<ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
</path> </path>
<path name="mic1-status"> <path name="mic1-status">
@ -115,7 +115,7 @@
</path> </path>
<path name="mic2-only"> <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="1" value="-1" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" 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="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
@ -143,7 +143,7 @@
<path name="mic-all"> <path name="mic-all">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" /> <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="2" value="2" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
<ctl name="MIC0" value="1" /> <ctl name="MIC0" value="1" />
@ -152,6 +152,44 @@
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="us-mic1-only">
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
<ctl name="BUILDIN US 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="us-mic2-only">
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="3" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
<ctl name="MIC1" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="us-mic3-only">
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="2" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
<ctl name="BUILDIN US 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="us-mic-all">
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="3" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="2" />
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
<ctl name="MIC0" value="1" />
<ctl name="MIC1" value="1" />
<ctl name="MIC2" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="cs35l41-us-config"> <path name="cs35l41-us-config">
<ctl name="ASPRX1 Slot Position" value="2"/> <ctl name="ASPRX1 Slot Position" value="2"/>
<ctl name="R ASPRX1 Slot Position" value="3"/> <ctl name="R ASPRX1 Slot Position" value="3"/>