Merge "[USB Audio AIDL] Add mixer path for "usb-device-microphones"" into 24D1-dev

This commit is contained in:
Treehugger Robot 2024-03-13 16:17:07 +00:00 committed by Android (Google) Code Review
commit f7aea63386
3 changed files with 27 additions and 3 deletions

View file

@ -1392,13 +1392,21 @@
<path name="bluetooth-sco-headset-microphones" /> <path name="bluetooth-sco-headset-microphones" />
</path> </path>
<path name="usb-headset-microphones"> <path name="usb-microphones">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<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" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c --> <!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start"> <path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware --> <!-- Enable it after get the protection firmware -->

View file

@ -1392,13 +1392,21 @@
<path name="bluetooth-sco-headset-microphones" /> <path name="bluetooth-sco-headset-microphones" />
</path> </path>
<path name="usb-headset-microphones"> <path name="usb-microphones">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<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" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c --> <!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start"> <path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware --> <!-- Enable it after get the protection firmware -->

View file

@ -1392,13 +1392,21 @@
<path name="bluetooth-sco-headset-microphones" /> <path name="bluetooth-sco-headset-microphones" />
</path> </path>
<path name="usb-headset-microphones"> <path name="usb-microphones">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<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" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c --> <!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start"> <path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware --> <!-- Enable it after get the protection firmware -->