audio:enable mmap and raw on BT am: 4581323719
am: f7ffa94926
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/21572785 Change-Id: I025e396e2321df15ea81543bbf6b89c24f068b06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
10c1bbd610
5 changed files with 46 additions and 29 deletions
|
@ -209,27 +209,27 @@
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||||
<route type="mix" sink="BT A2DP Out"
|
<route type="mix" sink="BT A2DP Out"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT A2DP Headphones"
|
<route type="mix" sink="BT A2DP Headphones"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT A2DP Speaker"
|
<route type="mix" sink="BT A2DP Speaker"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT BLE Headset"
|
<route type="mix" sink="BT BLE Headset"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT BLE Speaker"
|
<route type="mix" sink="BT BLE Speaker"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT BLE Broadcast"
|
<route type="mix" sink="BT BLE Broadcast"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Car Kit"
|
<route type="mix" sink="BT SCO Car Kit"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
||||||
<route type="mix" sink="primary input"
|
<route type="mix" sink="primary input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
|
||||||
|
@ -240,9 +240,9 @@
|
||||||
<route type="mix" sink="voip_tx"
|
<route type="mix" sink="voip_tx"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
|
||||||
<route type="mix" sink="fast input"
|
<route type="mix" sink="fast input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
|
||||||
<route type="mix" sink="mmap_no_irq_in"
|
<route type="mix" sink="mmap_no_irq_in"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
|
||||||
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
||||||
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
||||||
</routes>
|
</routes>
|
||||||
|
|
|
@ -181,11 +181,11 @@
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Car Kit"
|
<route type="mix" sink="BT SCO Car Kit"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
||||||
<route type="mix" sink="primary input"
|
<route type="mix" sink="primary input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
|
@ -196,9 +196,9 @@
|
||||||
<route type="mix" sink="voip_tx"
|
<route type="mix" sink="voip_tx"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="fast input"
|
<route type="mix" sink="fast input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="mmap_no_irq_in"
|
<route type="mix" sink="mmap_no_irq_in"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
||||||
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
||||||
</routes>
|
</routes>
|
||||||
|
|
|
@ -181,11 +181,11 @@
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Car Kit"
|
<route type="mix" sink="BT SCO Car Kit"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
||||||
<route type="mix" sink="primary input"
|
<route type="mix" sink="primary input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
|
@ -196,9 +196,9 @@
|
||||||
<route type="mix" sink="voip_tx"
|
<route type="mix" sink="voip_tx"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="fast input"
|
<route type="mix" sink="fast input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="mmap_no_irq_in"
|
<route type="mix" sink="mmap_no_irq_in"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
||||||
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
||||||
</routes>
|
</routes>
|
||||||
|
|
|
@ -196,21 +196,21 @@
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="BT A2DP Out"
|
<route type="mix" sink="BT A2DP Out"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT A2DP Headphones"
|
<route type="mix" sink="BT A2DP Headphones"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT A2DP Speaker"
|
<route type="mix" sink="BT A2DP Speaker"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT SCO Car Kit"
|
<route type="mix" sink="BT SCO Car Kit"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
||||||
<route type="mix" sink="primary input"
|
<route type="mix" sink="primary input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
|
@ -221,9 +221,9 @@
|
||||||
<route type="mix" sink="voip_tx"
|
<route type="mix" sink="voip_tx"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="fast input"
|
<route type="mix" sink="fast input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="mmap_no_irq_in"
|
<route type="mix" sink="mmap_no_irq_in"
|
||||||
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
|
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||||
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
|
||||||
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
|
||||||
</routes>
|
</routes>
|
||||||
|
|
|
@ -162,6 +162,7 @@
|
||||||
<ctl name="BT_RX Mixer EP7" value="0"/>
|
<ctl name="BT_RX Mixer EP7" value="0"/>
|
||||||
<ctl name="BT_RX Mixer NoHost1" value="0"/>
|
<ctl name="BT_RX Mixer NoHost1" value="0"/>
|
||||||
<ctl name="BT_RX Mixer VOIP" value="0"/>
|
<ctl name="BT_RX Mixer VOIP" value="0"/>
|
||||||
|
<ctl name="BT_RX Mixer RAW" value="0"/>
|
||||||
|
|
||||||
<ctl name="INCALL_RX Mixer EP1" value="0"/>
|
<ctl name="INCALL_RX Mixer EP1" value="0"/>
|
||||||
<ctl name="INCALL_RX Mixer EP2" value="0"/>
|
<ctl name="INCALL_RX Mixer EP2" value="0"/>
|
||||||
|
@ -396,6 +397,10 @@
|
||||||
<ctl name="USB_RX Mixer RAW" value="1"/>
|
<ctl name="USB_RX Mixer RAW" value="1"/>
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
<path name="raw-playbackP bt">
|
||||||
|
<ctl name="BT_RX Mixer RAW" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
<path name="raw-playbackP hearing-aid">
|
<path name="raw-playbackP hearing-aid">
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
@ -410,6 +415,10 @@
|
||||||
<ctl name="USB_RX Mixer EP1" value="1"/>
|
<ctl name="USB_RX Mixer EP1" value="1"/>
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
<path name="mmap-playbackP bt">
|
||||||
|
<ctl name="BT_RX Mixer EP1" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
<path name="mmap-playbackP hearing-aid">
|
<path name="mmap-playbackP hearing-aid">
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
@ -596,6 +605,10 @@
|
||||||
<ctl name="EP3 TX Mixer USB_TX" value="1"/>
|
<ctl name="EP3 TX Mixer USB_TX" value="1"/>
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
<path name="low-latency-recordC bt-mic">
|
||||||
|
<ctl name="EP3 TX Mixer BT_TX" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
<path name="mmap-recordC">
|
<path name="mmap-recordC">
|
||||||
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
|
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
|
||||||
</path>
|
</path>
|
||||||
|
@ -604,6 +617,10 @@
|
||||||
<ctl name="EP2 TX Mixer USB_TX" value="1"/>
|
<ctl name="EP2 TX Mixer USB_TX" value="1"/>
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
<path name="mmap-recordC bt-mic">
|
||||||
|
<ctl name="EP2 TX Mixer BT_TX" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
<!-- codec setting -->>
|
<!-- codec setting -->>
|
||||||
<!-- Rx device -->
|
<!-- Rx device -->
|
||||||
<path name="handset">
|
<path name="handset">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue