audio: remove bt path for raw and mmap playback

In AOC, ULL support requires the sink to be ULL
Speaker, Analog HP and USB are ULL Sinks,
Modem and BT are LL

Bug: 165737390
Test: OboeTester --> TEST OUTPUT
Change-Id: I23da02a52586e2f5d017142b5947dd082cdc2c62
This commit is contained in:
millerliang 2021-05-10 22:08:03 +08:00
parent c35126b2ef
commit cdeb65a6c2
16 changed files with 45 additions and 101 deletions

View file

@ -182,21 +182,21 @@
<route type="mix" sink="Earpiece"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT A2DP Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Headphones"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Speaker"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="USB Device Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -169,11 +169,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -169,11 +169,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -380,13 +380,6 @@
<path name="raw-playbackP hac-handset">
</path>
<path name="raw-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP4" value="1"/>
</path>
<path name="raw-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>
@ -407,13 +400,6 @@
<path name="mmap-playbackP hac-handset">
</path>
<path name="mmap-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP1" value="1"/>
</path>
<path name="mmap-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>

View file

@ -182,21 +182,21 @@
<route type="mix" sink="Earpiece"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT A2DP Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Headphones"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Speaker"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="USB Device Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -169,11 +169,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -169,11 +169,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -398,13 +398,6 @@
<path name="raw-playbackP hac-handset">
</path>
<path name="raw-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP4" value="1"/>
</path>
<path name="raw-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>
@ -434,13 +427,6 @@
<path name="mmap-playbackP hac-handset">
</path>
<path name="mmap-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP1" value="1"/>
</path>
<path name="mmap-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>

View file

@ -180,21 +180,21 @@
<route type="mix" sink="Earpiece"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT A2DP Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Headphones"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="USB Device Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -169,11 +169,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -169,11 +169,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -344,13 +344,6 @@
<path name="raw-playbackP hac-handset">
</path>
<path name="raw-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP4" value="1"/>
</path>
<path name="raw-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>
@ -371,13 +364,6 @@
<path name="mmap-playbackP hac-handset">
</path>
<path name="mmap-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP1" value="1"/>
</path>
<path name="mmap-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>

View file

@ -164,11 +164,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -164,11 +164,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -164,11 +164,11 @@
<route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Car Kit"
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
<route type="mix" sink="primary input"
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

View file

@ -393,13 +393,6 @@
<path name="raw-playbackP hac-handset">
</path>
<path name="raw-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP4" value="1"/>
</path>
<path name="raw-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>
@ -429,13 +422,6 @@
<path name="mmap-playbackP hac-handset">
</path>
<path name="mmap-playbackP bt">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="2"/>
<ctl name="SINK_IDS" id="1" value="-1"/>
<ctl name="BT_RX Mixer EP1" value="1"/>
</path>
<path name="mmap-playbackP usb-headphone">
<ctl name="PCM Playback Volume" value="1000"/>
<ctl name="SINK_IDS" id="0" value="4"/>