Merge "fix usb factory loopback/playback/capture fail"

This commit is contained in:
TreeHugger Robot 2022-12-15 10:23:00 +00:00 committed by Android (Google) Code Review
commit eb2d1dec89
6 changed files with 9 additions and 3 deletions

View file

@ -240,7 +240,7 @@
<ctl name="MIC Record Soft Gain (dB)" value="-40"/> <ctl name="MIC Record Soft Gain (dB)" value="-40"/>
<!-- USB setting v2 --> <!-- 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 Dev ID v2" value="2"/>
<ctl name="USB Playback EP ID v2" value="1"/> <ctl name="USB Playback EP ID v2" value="1"/>
<ctl name="USB Playback FORMAT v2" value="0"/> <ctl name="USB Playback FORMAT v2" value="0"/>

View file

@ -42,6 +42,7 @@
<path name="mfg-record usb-headset-mic"> <path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/> <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Playback EP ID v2" value="0" />
<ctl name="USB Capture FORMAT v2" value="1" /> <ctl name="USB Capture FORMAT v2" value="1" />
<ctl name="USB Config To AoC v2" value="1"/> <ctl name="USB Config To AoC v2" value="1"/>
<ctl name="EP1 TX Mixer USB_TX" value="1"/> <ctl name="EP1 TX Mixer USB_TX" value="1"/>
@ -296,6 +297,7 @@
<path name="mfg-playback usb-headphones"> <path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" /> <ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Playback EP ID v2" value="1" /> <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 FORMAT v2" value="6" />
<ctl name="USB Playback SR v2" value="48000" /> <ctl name="USB Playback SR v2" value="48000" />
<ctl name="USB Playback CH v2" value="2" /> <ctl name="USB Playback CH v2" value="2" />

View file

@ -248,7 +248,7 @@
<ctl name="MIC Record Soft Gain (dB)" value="-40"/> <ctl name="MIC Record Soft Gain (dB)" value="-40"/>
<!-- USB setting v2 --> <!-- 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 Dev ID v2" value="2"/>
<ctl name="USB Playback EP ID v2" value="1"/> <ctl name="USB Playback EP ID v2" value="1"/>
<ctl name="USB Playback FORMAT v2" value="0"/> <ctl name="USB Playback FORMAT v2" value="0"/>

View file

@ -44,6 +44,7 @@
<path name="mfg-record usb-headset-mic"> <path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/> <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Playback EP ID v2" value="0" />
<ctl name="USB Capture FORMAT v2" value="1" /> <ctl name="USB Capture FORMAT v2" value="1" />
<ctl name="USB Config To AoC v2" value="1"/> <ctl name="USB Config To AoC v2" value="1"/>
<ctl name="EP1 TX Mixer USB_TX" value="1"/> <ctl name="EP1 TX Mixer USB_TX" value="1"/>
@ -422,6 +423,7 @@
<path name="mfg-playback usb-headphones"> <path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" /> <ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Playback EP ID v2" value="1" /> <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 FORMAT v2" value="6" />
<ctl name="USB Playback SR v2" value="48000" /> <ctl name="USB Playback SR v2" value="48000" />
<ctl name="USB Playback CH v2" value="2" /> <ctl name="USB Playback CH v2" value="2" />

View file

@ -240,7 +240,7 @@
<ctl name="MIC Record Soft Gain (dB)" value="-40"/> <ctl name="MIC Record Soft Gain (dB)" value="-40"/>
<!-- USB setting v2 --> <!-- 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 Dev ID v2" value="2"/>
<ctl name="USB Playback EP ID v2" value="1"/> <ctl name="USB Playback EP ID v2" value="1"/>
<ctl name="USB Playback FORMAT v2" value="0"/> <ctl name="USB Playback FORMAT v2" value="0"/>

View file

@ -42,6 +42,7 @@
<path name="mfg-record usb-headset-mic"> <path name="mfg-record usb-headset-mic">
<ctl name="Audio Capture Mic Source" value="USB_MIC"/> <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
<ctl name="USB Playback EP ID v2" value="0" />
<ctl name="USB Capture FORMAT v2" value="1" /> <ctl name="USB Capture FORMAT v2" value="1" />
<ctl name="USB Config To AoC v2" value="1"/> <ctl name="USB Config To AoC v2" value="1"/>
<ctl name="EP1 TX Mixer USB_TX" value="1"/> <ctl name="EP1 TX Mixer USB_TX" value="1"/>
@ -296,6 +297,7 @@
<path name="mfg-playback usb-headphones"> <path name="mfg-playback usb-headphones">
<ctl name="USB Dev ID v2" value="2" /> <ctl name="USB Dev ID v2" value="2" />
<ctl name="USB Playback EP ID v2" value="1" /> <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 FORMAT v2" value="6" />
<ctl name="USB Playback SR v2" value="48000" /> <ctl name="USB Playback SR v2" value="48000" />
<ctl name="USB Playback CH v2" value="2" /> <ctl name="USB Playback CH v2" value="2" />