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

audio: fix PDM mask in mixer_paths.xml am: 277d3a9d25 am: 9ca5c4ca10

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/17520891

Change-Id: I34a32a18cdcfb1d847169acc8c0f09ffa3fbafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Li 2022-04-01 02:10:03 +00:00 • committed by Automerger Merge Worker
commit 513b823b5a
2 changed files with 22 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

67
audio/felix/config/mixer_paths.xml
View file

@ -671,13 +671,17 @@
<ctl name="R Main AMP Enable Switch" value="1"/> <ctl name="R Main AMP Enable Switch" value="1"/>
</path> </path>
<!-- Tx device --> <path name="builtin-3mics">
<path name="handset-mic">
<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"/>
</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"/> <ctl name="MIC DC Blocker" value="1"/>
</path> </path>
@ -686,10 +690,7 @@
</path> </path>
<path name="voice-handset-mic"> <path name="voice-handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="MIC DC Blocker" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/> <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
</path> </path>
@ -699,11 +700,8 @@
</path> </path>
<path name="speaker-mic"> <path name="speaker-mic">
<path name="builtin-3mics" />
<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="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="MIC DC Blocker" value="1"/>
</path> </path>
@ -712,10 +710,7 @@
</path> </path>
<path name="voice-speaker-mic"> <path name="voice-speaker-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="MIC DC Blocker" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/> <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
</path> </path>
@ -725,11 +720,8 @@
</path> </path>
<path name="camcorder-mic"> <path name="camcorder-mic">
<path name="builtin-3mics" />
<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="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="MIC DC Blocker" value="1"/>
</path> </path>
@ -738,10 +730,7 @@
</path> </path>
<path name="voice-recog-mic"> <path name="voice-recog-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="MIC DC Blocker" value="1"/>
</path> </path>
@ -750,11 +739,8 @@
</path> </path>
<path name="voice-recog-aec-mic"> <path name="voice-recog-aec-mic">
<path name="builtin-3mics" />
<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="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="MIC DC Blocker" value="1"/>
<ctl name="Audio Capture Mic Source" value="ERASER"/> <ctl name="Audio Capture Mic Source" value="ERASER"/>
</path> </path>
@ -764,10 +750,7 @@
</path> </path>
<path name="unprocessed-mic"> <path name="unprocessed-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="MIC DC Blocker" value="1"/>
</path> </path>
@ -776,10 +759,7 @@
</path> </path>
<path name="unprocessed-dual-mic"> <path name="unprocessed-dual-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="MIC DC Blocker" value="1"/>
</path> </path>
@ -788,10 +768,7 @@
</path> </path>
<path name="unprocessed-triple-mic"> <path name="unprocessed-triple-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="MIC DC Blocker" value="1"/>
</path> </path>
@ -800,10 +777,7 @@
</path> </path>
<path name="bt-mic"> <path name="bt-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="Audio Capture Mic Source" value="BT_MIC"/> <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
<ctl name="Voice Call Mic Source" value="BT_MIC"/> <ctl name="Voice Call Mic Source" value="BT_MIC"/>
</path> </path>
@ -813,10 +787,7 @@
</path> </path>
<path name="usb-headset-mic"> <path name="usb-headset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <path name="builtin-3mics" />
<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="Audio Capture Mic Source" value="USB_MIC"/> <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="Voice Call Mic Source" value="USB_MIC"/> <ctl name="Voice Call Mic Source" value="USB_MIC"/>
</path> </path>

30
audio/felix/config/mixer_paths_factory.xml
View file

@ -11,10 +11,6 @@
<ctl name="EP1 TX Mixer TDM_0_TX" value="0" /> <ctl name="EP1 TX Mixer TDM_0_TX" value="0" />
<ctl name="DEFAULT_MIC_ID" 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" /> <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
<path name="mfg-playback"> <path name="mfg-playback">
@ -44,19 +40,15 @@
</path> </path>
<path name="mic1-status"> <path name="mic1-status">
<ctl name="MIC0" value="1" />
</path> </path>
<path name="mic2-status"> <path name="mic2-status">
<ctl name="MIC1" value="1" />
</path> </path>
<path name="mic3-status"> <path name="mic3-status">
<ctl name="MIC2" value="1" />
</path> </path>
<path name="mic4-status"> <path name="mic4-status">
<ctl name="MIC3" value="1" />
</path> </path>
<path name="mic1-gain"> <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="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" />
<ctl name="MIC0" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</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" />
<ctl name="MIC1" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
@ -122,28 +112,14 @@
<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" />
<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" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<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="3" /> <ctl name="BUILDIN 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="MIC3" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>