Add speaker + bt-sco combo device

* Add path entry for speaker + bt-sco combo device in mixer_path_tavil.xml
* Add backend support for such path in audio_platform_info_tavil.xml
* Add audio-ull-playback paths for Bluetooth:
    audio-ull-playback bt-sco
    audio-ull-playback bt-sco-wb

Bug: 62541790
Bug: 19171297
Test: make, HFP regression, testplans/92476
Change-Id: Iafd893da6d044bc4c9679da12692d8f9eec33a79
This commit is contained in:
Jack He
2017-06-02 19:28:53 -07:00
parent 75c65a0488
commit 2ef40488a8
2 changed files with 63 additions and 0 deletions

View File

@@ -71,6 +71,10 @@
<device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="handset-hac" interface="SLIMBUS_0_RX"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
</backend_names>
<app_types>
<app uc_type="PCM_PLAYBACK" mode="default" bit_width="16" id="69936" max_rate="96000" />

View File

@@ -681,6 +681,16 @@
<path name="deep-buffer-playback speaker" />
</path>
<path name="deep-buffer-playback speaker-and-bt-sco">
<path name="deep-buffer-playback speaker" />
<path name="deep-buffer-playback bt-sco" />
</path>
<path name="deep-buffer-playback speaker-and-bt-sco-wb">
<path name="deep-buffer-playback speaker" />
<path name="deep-buffer-playback bt-sco-wb" />
</path>
<path name="low-latency-playback">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -741,6 +751,16 @@
<path name="low-latency-playback speaker" />
</path>
<path name="low-latency-playback speaker-and-bt-sco">
<path name="low-latency-playback speaker" />
<path name="low-latency-playback bt-sco" />
</path>
<path name="low-latency-playback speaker-and-bt-sco-wb">
<path name="low-latency-playback speaker" />
<path name="low-latency-playback bt-sco-wb" />
</path>
<path name="audio-ull-playback">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -775,6 +795,15 @@
<path name="audio-ull-playback speaker" />
</path>
<path name="audio-ull-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
</path>
<path name="audio-ull-playback bt-sco-wb">
<ctl name="BT SampleRate" value="KHZ_16" />
<path name="audio-ull-playback bt-sco" />
</path>
<path name="audio-ull-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -792,6 +821,16 @@
<path name="audio-ull-playback speaker" />
</path>
<path name="audio-ull-playback speaker-and-bt-sco">
<path name="audio-ull-playback speaker" />
<path name="audio-ull-playback bt-sco" />
</path>
<path name="audio-ull-playback speaker-and-bt-sco-wb">
<path name="audio-ull-playback speaker" />
<path name="audio-ull-playback bt-sco-wb" />
</path>
<path name="hifi-playback display-port">
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
@@ -868,6 +907,16 @@
<path name="compress-offload-playback speaker" />
</path>
<path name="compress-offload-playback speaker-and-bt-sco">
<path name="compress-offload-playback speaker" />
<path name="compress-offload-playback bt-sco" />
</path>
<path name="compress-offload-playback speaker-and-bt-sco-wb">
<path name="compress-offload-playback speaker" />
<path name="compress-offload-playback bt-sco-wb" />
</path>
<path name="mmap-playback">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -894,6 +943,16 @@
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="mmap-playback speaker-and-bt-sco">
<path name="mmap-playback speaker" />
<path name="mmap-playback bt-sco" />
</path>
<path name="mmap-playback speaker-and-bt-sco-wb">
<path name="mmap-playback speaker" />
<path name="mmap-playback bt-sco-wb" />
</path>
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>