Merge "audio: sync the mixer path table" into udc-dev am: 45ecd1ef6b

Original change: https://googleplex-android-review.googlesource.com/c/device/google/comet/+/21553961

Change-Id: I2f98a53bffd2925db71309d5e1afbe09434b3431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2023-03-01 10:53:49 +00:00 committed by Automerger Merge Worker
commit fd45e15055
3 changed files with 193 additions and 62 deletions

View file

@ -36,7 +36,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
<profile name="" format="AUDIO_FORMAT_MP3"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>

View file

@ -31,7 +31,7 @@
<ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
<!-- Enable it when AOC is ready to trim delay and padding -->
<!--ctl name="Gapless Offload Enable" value="1"/-->
<ctl name="Gapless Offload Enable" value="1"/>
<!-- TDM 0 setting -->
<ctl name="TDM_0_RX Chan" value="Four"/>
@ -50,17 +50,69 @@
<ctl name="RX Slots" id="0" value="2"/>
<ctl name="RX Slots" id="1" value="3"/>
<!-- Tas2562 settings -->
<ctl name="TAS256X ASI Left Switch" value="0" />
<ctl name="TAS256X ASI Right Switch" value="0" />
<ctl name="TAS256X ASI1 SEL LEFT" value="Left" />
<ctl name="TAS256X ASI1 SEL RIGHT" value="Right" />
<ctl name="TAS256X PLAYBACK VOLUME LEFT" value="55" />
<ctl name="TAS256X PLAYBACK VOLUME RIGHT" value="55" />
<ctl name="TAS256X AMP OUTPUT LVL LEFT" value="16" />
<ctl name="TAS256X AMP OUTPUT LVL RIGHT" value="16" />
<ctl name="TAS25XX_ALGO_PROFILE" value="MUSIC" />
<ctl name="TAS25XX_ALGO_BYPASS" value="TRUE" />
<!-- Cirrus default 96K -->
<ctl name="Default 96K" value="0"/>
<ctl name="R Default 96K" value="0"/>
<!-- Cirrus Booster Amp TDM slot assignment-->
<!-- RX slot -->
<ctl name="ASPRX1 Slot Position" value="0"/>
<ctl name="ASPRX2 Slot Position" value="1"/>
<ctl name="R ASPRX1 Slot Position" value="1"/>
<ctl name="R ASPRX2 Slot Position" value="0"/>
<!-- TX slot -->
<ctl name="ASPTX1 Slot Position" value="0"/>
<ctl name="R ASPTX1 Slot Position" value="1"/>
<ctl name="ASPTX2 Slot Position" value="2"/>
<ctl name="R ASPTX2 Slot Position" value="3"/>
<ctl name="ASPTX3 Slot Position" value="4"/>
<ctl name="R ASPTX3 Slot Position" value="5"/>
<ctl name="ASPTX4 Slot Position" value="6"/>
<ctl name="R ASPTX4 Slot Position" value="7"/>
<!-- Cirrus Booster Amp DRE and VBST config-->
<ctl name="VBSTMON Output Switch" value="1"/>
<ctl name="R VBSTMON Output Switch" value="1"/>
<ctl name="DRE DRE Switch" value="1"/>
<ctl name="R DRE DRE Switch" value="1"/>
<!-- Cirrus Booster Amp Output Gain -->
<ctl name="AMP PCM Gain" value="17"/>
<ctl name="R AMP PCM Gain" value="17"/>
<ctl name="Digital PCM Volume" value="817"/>
<ctl name="R Digital PCM Volume" value="817"/>
<!-- Cirrus Booster Amp Power -->
<ctl name="Main AMP Enable Switch" value="0"/>
<ctl name="R Main AMP Enable Switch" value="0"/>
<!-- Cirrus Booster mode -->
<ctl name="PCM Source" value="DSP"/>
<ctl name="R PCM Source" value="DSP"/>
<ctl name="DSP1 Firmware" value="Protection"/>
<ctl name="R DSP1 Firmware" value="Protection"/>
<ctl name="DSP RX1 Source" value="ASPRX1"/>
<ctl name="DSP RX2 Source" value="ASPRX1"/>
<ctl name="R DSP RX1 Source" value="ASPRX1"/>
<ctl name="R DSP RX2 Source" value="ASPRX1"/>
<ctl name="Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
<!-- Cirrus ASP TX source -->
<ctl name="ASP TX1 Source" value="VMON" />
<ctl name="R ASP TX1 Source" value="VMON" />
<ctl name="ASP TX2 Source" value="IMON" />
<ctl name="R ASP TX2 Source" value="IMON" />
<ctl name="ASP TX3 Source" value="Zero" />
<ctl name="R ASP TX3 Source" value="Zero" />
<ctl name="ASP TX4 Source" value="Zero" />
<ctl name="R ASP TX4 Source" value="Zero" />
<!-- Cirrus fast switch init -->
<!--ctl name="Fast Use Case Switch Enable" value="0" />
<ctl name="Fast Use Case Delta File" value="fast_switch5.txt" />
<ctl name="R Fast Use Case Switch Enable" value="0" />
<ctl name="R Fast Use Case Delta File" value="fast_switch5.txt" /-->
<!-- default EP volume -->
<ctl name="PCM Playback Switch" value="1"/>
@ -188,7 +240,7 @@
<ctl name="MIC Record Soft Gain (dB)" value="-40"/>
<!-- USB setting v2 -->
<ctl name="USB Bus ID v2" value="2"/>
<ctl name="USB Bus ID v2" 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="0"/>
@ -597,21 +649,16 @@
<!-- codec setting -->>
<!-- Rx device -->
<path name="handset">
<ctl name="TAS25XX_ALGO_BYPASS" value="TRUE" />
<ctl name="TAS256X PLAYBACK VOLUME LEFT" value="55" />
<ctl name="TAS256X PLAYBACK VOLUME RIGHT" value="55" />
<ctl name="TAS256X AMP OUTPUT LVL LEFT" value="1" />
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="TAS256X ASI Right Switch" value="0" />
<ctl name="PCM Source" value="ASP"/>
<ctl name="AMP PCM Gain" value="6"/>
<ctl name="Main AMP Enable Switch" value="1"/>
</path>
<path name="voice-handset">
<ctl name="TAS25XX_ALGO_BYPASS" value="TRUE" />
<ctl name="TAS256X PLAYBACK VOLUME LEFT" value="55" />
<ctl name="TAS256X PLAYBACK VOLUME RIGHT" value="55" />
<ctl name="TAS256X AMP OUTPUT LVL LEFT" value="1" />
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="TAS256X ASI Right Switch" value="0" />
<ctl name="Boost Peak Current Limit" value="3.50A"/>
<ctl name="PCM Source" value="ASP"/>
<ctl name="AMP PCM Gain" value="7"/>
<ctl name="Main AMP Enable Switch" value="1"/>
</path>
<path name="voice-hac">
@ -622,31 +669,54 @@
</path>
<path name="speaker">
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="TAS256X ASI Right Switch" value="1" />
<ctl name="Boost Peak Current Limit" value="2.50A"/>
<ctl name="R Boost Peak Current Limit" value="2.50A"/>
<ctl name="Main AMP Enable Switch" value="1"/>
<ctl name="R Main AMP Enable Switch" value="1"/>
</path>
<path name="speaker-post">
<!-- load Bypass FIR -->
<!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<path name="voice-speaker">
<ctl name="TAS25XX_ALGO_PROFILE" value="VOICE" />
<ctl name="TAS256X ASI Left Switch" value="0" />
<ctl name="TAS256X ASI Right Switch" value="1" />
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="Boost Peak Current Limit" value="3.50A"/>
<ctl name="ASPTX1 Slot Position" value="1"/>
<ctl name="R ASPTX1 Slot Position" value="0"/>
<!--<ctl name="R DSP RX2 Source" value="ASPRX2"/>-->
<ctl name="R Main AMP Enable Switch" value="1"/>
<ctl name="Main AMP Enable Switch" value="1"/>
</path>
<path name="voice-speaker-post">
<!-- load Enable FIR -->
<!--ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="Digital PCM Volume" value="800"/-->
</path>
<path name="voice-dual-speaker">
<ctl name="TAS25XX_ALGO_PROFILE" value="VOICE" />
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="TAS256X ASI Right Switch" value="1" />
<!-- Speaker Separation -->
<path name="voice-speaker" />
<path name="voice-speaker-post" />
</path>
<path name="speaker-safe">
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="TAS256X ASI Right Switch" value="0" />
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Main AMP Enable Switch" value="1"/>
</path>
<path name="speaker-safe-post">
<!-- load Bypass FIR -->
<!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<path name="usb-tty-full">
@ -662,7 +732,7 @@
<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="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="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/>
@ -674,7 +744,7 @@
<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="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"/>
@ -688,7 +758,7 @@
<path name="speaker-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="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="3" value="-1"/>
<ctl name="MIC DC Blocker" value="1"/>

View file

@ -3,8 +3,8 @@
<ctl name="TDM_0_RX Mixer EP3" value="0" />
<ctl name="TDM_0_RX Mixer EP6" value="0" />
<ctl name="I2S_0_RX Mixer EP3" value="0" />
<ctl name="TAS256X ASI Left Switch" value="0" />
<ctl name="TAS256X ASI Right Switch" value="0" />
<ctl name="Main AMP Enable Switch" value="0" />
<ctl name="R Main AMP Enable Switch" value="0" />
<ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
<ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
<ctl name="MIC Record Soft Gain (dB)" value="0"/>
@ -19,6 +19,8 @@
<ctl name="TDM_0_RX Mixer US" value="0" />
<ctl name="US Record Enable" value="0" />
<ctl name="ASPRX1 Slot Position" value="0"/>
<ctl name="R ASPRX1 Slot Position" value="1"/>
<path name="mfg-playback">
</path>
@ -40,6 +42,8 @@
<path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Playback EP ID v2" value="0" />
<ctl name="USB Capture EP ID v2" value="1" />
<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"/>
@ -103,7 +107,7 @@
</path>
<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="2" value="-1" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
@ -122,7 +126,7 @@
<path name="mic-all">
<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="3" value="-1" />
<ctl name="MIC0" value="1" />
@ -142,7 +146,7 @@
</path>
<path name="us-mic2-only">
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="1" />
<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" />
@ -161,7 +165,7 @@
<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="1" />
<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" />
@ -177,14 +181,62 @@
</path>
<path name="amp_iv-only">
<ctl name="R ASPTX1 Slot Position" value="2" />
<ctl name="R ASPTX2 Slot Position" value="3" />
<ctl name="R ASPTX3 Slot Position" value="6" />
<ctl name="R ASPTX4 Slot Position" value="7" />
<ctl name="ASPTX1 Slot Position" value="0" />
<ctl name="ASPTX2 Slot Position" value="1" />
<ctl name="ASPTX3 Slot Position" value="4" />
<ctl name="ASPTX4 Slot Position" value="5" />
<ctl name="R ASP TX1 Source" value="VMON" />
<ctl name="R ASP TX2 Source" value="ASPRX1" />
<ctl name="R ASP TX3 Source" value="Zero" />
<ctl name="R ASP TX4 Source" value="Zero" />
<ctl name="ASP TX1 Source" value="VMON" />
<ctl name="ASP TX2 Source" value="ASPRX1" />
<ctl name="ASP TX3 Source" value="Zero" />
<ctl name="ASP TX4 Source" value="Zero" />
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
<path name="amp_iv1-only">
<ctl name="R ASPTX1 Slot Position" value="4" />
<ctl name="R ASPTX2 Slot Position" value="5" />
<ctl name="R ASPTX3 Slot Position" value="6" />
<ctl name="R ASPTX4 Slot Position" value="7" />
<ctl name="ASPTX1 Slot Position" value="0" />
<ctl name="ASPTX2 Slot Position" value="1" />
<ctl name="ASPTX3 Slot Position" value="2" />
<ctl name="ASPTX4 Slot Position" value="3" />
<ctl name="R ASP TX1 Source" value="Zero" />
<ctl name="R ASP TX2 Source" value="Zero" />
<ctl name="R ASP TX3 Source" value="Zero" />
<ctl name="R ASP TX4 Source" value="Zero" />
<ctl name="ASP TX1 Source" value="VMON" />
<ctl name="ASP TX2 Source" value="IMON" />
<ctl name="ASP TX3 Source" value="VPMON" />
<ctl name="ASP TX4 Source" value="ASPRX1" />
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
<path name="amp_iv2-only">
<ctl name="R ASPTX1 Slot Position" value="0" />
<ctl name="R ASPTX2 Slot Position" value="1" />
<ctl name="R ASPTX3 Slot Position" value="2" />
<ctl name="R ASPTX4 Slot Position" value="3" />
<ctl name="ASPTX1 Slot Position" value="4" />
<ctl name="ASPTX2 Slot Position" value="5" />
<ctl name="ASPTX3 Slot Position" value="6" />
<ctl name="ASPTX4 Slot Position" value="7" />
<ctl name="R ASP TX1 Source" value="VMON" />
<ctl name="R ASP TX2 Source" value="IMON" />
<ctl name="R ASP TX3 Source" value="VPMON" />
<ctl name="R ASP TX4 Source" value="ASPRX1" />
<ctl name="ASP TX1 Source" value="Zero" />
<ctl name="ASP TX2 Source" value="Zero" />
<ctl name="ASP TX3 Source" value="Zero" />
<ctl name="ASP TX4 Source" value="Zero" />
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
@ -207,19 +259,19 @@
</path>
<path name="speaker1-status">
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" />
</path>
<path name="speaker2-status">
<ctl name="TAS256X ASI Right Switch" value="1" />
<ctl name="R Main AMP Enable Switch" value="1" />
</path>
<path name="speaker1-gain">
<ctl name="TAS256X AMP OUTPUT LVL LEFT" />
<ctl name="AMP PCM Gain" />
</path>
<path name="speaker2-gain">
<ctl name="TAS256X AMP OUTPUT LVL RIGHT" />
<ctl name="R AMP PCM Gain" />
</path>
<path name="usb-playback-gain">
@ -229,6 +281,8 @@
<path name="mfg-playback speaker">
<ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP3" value="1" />
<ctl name="ASPRX1 Slot Position" value="0" />
<ctl name="R ASPRX1 Slot Position" value="1" />
<ctl name="SINK_IDS" id="0" value="0" />
<ctl name="SINK_IDS" id="1" value="-1" />
</path>
@ -244,6 +298,7 @@
<path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Playback EP ID v2" value="1" />
<ctl name="USB Capture EP ID v2" value="0" />
<ctl name="USB Playback FORMAT v2" value="6" />
<ctl name="USB Playback SR v2" value="48000" />
<ctl name="USB Playback CH v2" value="2" />
@ -253,34 +308,36 @@
</path>
<path name="us-mfg-playback speaker">
<!--path name="cs35l41-us-config" /-->
<path name="cs35l41-us-config" />
<ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
<ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
<ctl name="TDM_0_RX Mixer US" value="1" />
</path>
<path name="speaker1-only">
<ctl name="Main AMP Enable Switch" value="1" />
<path name="mfg-playback speaker" />
<ctl name="TAS256X AMP OUTPUT LVL LEFT" value="16" />
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="AMP PCM Gain" value="17" />
<ctl name="PCM Source" value="ASP" />
</path>
<path name="speaker2-only">
<ctl name="R Main AMP Enable Switch" value="1" />
<path name="mfg-playback speaker" />
<ctl name="TAS256X AMP OUTPUT LVL RIGHT" value="16" />
<ctl name="TAS256X ASI Right Switch" value="1" />
<ctl name="R AMP PCM Gain" value="17" />
<ctl name="R PCM Source" value="ASP" />
</path>
<path name="us-speaker1-only">
<path name="us-mfg-playback speaker" />
<ctl name="TAS256X AMP OUTPUT LVL LEFT" value="16" />
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="PCM Source" value="ASP" />
<ctl name="Main AMP Enable Switch" value="1" />
</path>
<path name="us-speaker2-only">
<path name="us-mfg-playback speaker" />
<ctl name="TAS256X AMP OUTPUT LVL RIGHT" value="16" />
<ctl name="TAS256X ASI Right Switch" value="1" />
<ctl name="R PCM Source" value="ASP" />
<ctl name="R Main AMP Enable Switch" value="1" />
</path>
<path name="headphones">
@ -296,15 +353,19 @@
</path>
<path name="speaker-all">
<ctl name="Main AMP Enable Switch" value="1" />
<ctl name="PCM Source" value="ASP" />
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="R PCM Source" value="ASP" />
<path name="mfg-playback speaker" />
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="TAS256X ASI Right Switch" value="1" />
</path>
<path name="us-speaker-all">
<path name="us-mfg-playback speaker" />
<ctl name="TAS256X ASI Left Switch" value="1" />
<ctl name="TAS256X ASI Right Switch" value="1" />
<ctl name="PCM Source" value="ASP" />
<ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R PCM Source" value="ASP" />
<ctl name="R Main AMP Enable Switch" value="1" />
</path>
<path name="loopback-mic-speaker">