diff options
author | Cheney Ni <cheneyni@google.com> | 2019-02-24 04:05:17 +0800 |
---|---|---|
committer | Hansong Zhang <hsz@google.com> | 2019-02-26 21:10:27 +0000 |
commit | e75cd66b4e4d4ef92e3f7d763067bdac78df6cc8 (patch) | |
tree | 5bd20f9165ad756b06587eda4d1e6c1759e56eba | |
parent | c180f114d779545ab2324ad0a1b3a9d1c0263dd4 (diff) | |
download | bonito-e75cd66b4e4d4ef92e3f7d763067bdac78df6cc8.tar.gz |
BluetoothAudio HAL: flip to be enabled by default on Bonito
Swap audio XML files, and supports following scenarios:
1) (default) audio_policy_configuration.xml
Using BluetoothAudio HAL and A2DP offload
2) audio_policy_configuration_a2dp_offload_disabled.xml
Using BluetoothAudio HAL only when A2DP offload is disabled
3) audio_policy_configuration_bluetooth_legacy_hal.xml
No BluetoothAudio HAL nor A2DP offload
Bug: 126304229
Test: Switch BluetoothAudio HAL and A2DP offload manully
Change-Id: I6a6b93d687153532ba964aacaa1249bd2ff6b2aa
-rw-r--r-- | a2dp_in_audio_policy_configuration.xml | 22 | ||||
-rw-r--r-- | audio_policy_configuration.xml | 4 | ||||
-rw-r--r-- | audio_policy_configuration_a2dp_offload_disabled.xml | 30 | ||||
-rw-r--r-- | audio_policy_configuration_bluetooth_legacy_hal.xml (renamed from audio_policy_configuration_bluetooth_hal_enabled.xml) | 29 | ||||
-rw-r--r-- | device.mk | 9 |
5 files changed, 33 insertions, 61 deletions
diff --git a/a2dp_in_audio_policy_configuration.xml b/a2dp_in_audio_policy_configuration.xml deleted file mode 100644 index 57bd4f81..00000000 --- a/a2dp_in_audio_policy_configuration.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Bluetooth Input Audio HAL Audio Policy Configuration file --> -<module name="a2dp" halVersion="2.0"> - <mixPorts> - <mixPort name="a2dp input" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </mixPort> - </mixPorts> - <devicePorts> - <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </devicePort> - </devicePorts> - <routes> - <route type="mix" sink="a2dp input" - sources="BT A2DP In"/> - </routes> -</module> diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml index ce786319..7ad24ee0 100644 --- a/audio_policy_configuration.xml +++ b/audio_policy_configuration.xml @@ -232,8 +232,8 @@ <!-- Remote Submix Audio HAL --> <xi:include href="r_submix_audio_policy_configuration.xml"/> - <!-- Hearing aid Audio HAL --> - <xi:include href="hearing_aid_audio_policy_configuration.xml"/> + <!-- Bluetooth Audio HAL for Hearing aid --> + <xi:include href="bluetooth_hearing_aid_audio_policy_configuration.xml"/> </modules> diff --git a/audio_policy_configuration_a2dp_offload_disabled.xml b/audio_policy_configuration_a2dp_offload_disabled.xml index b45b5901..dcbcd555 100644 --- a/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio_policy_configuration_a2dp_offload_disabled.xml @@ -112,6 +112,12 @@ </devicePort> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> </devicePort> + <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink"> + </devicePort> + <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink"> + </devicePort> + <devicePort tagName="Line Out" type="AUDIO_DEVICE_OUT_LINE" role="sink"> + </devicePort> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> </devicePort> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> @@ -128,6 +134,8 @@ </devicePort> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> </devicePort> + <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source"> + </devicePort> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> </devicePort> <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source"> @@ -145,6 +153,12 @@ sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> <route type="mix" sink="Speaker Safe" sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> + <route type="mix" sink="Wired Headset" + sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> + <route type="mix" sink="Wired Headphones" + sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> + <route type="mix" sink="Line Out" + sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> <route type="mix" sink="BT SCO" sources="primary output,raw,deep_buffer,voip_rx"/> <route type="mix" sink="BT SCO Headset" @@ -158,21 +172,21 @@ <route type="mix" sink="Telephony Tx" sources="voice_tx,incall_music_uplink"/> <route type="mix" sink="primary input" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="fast input" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voice_rx" sources="Telephony Rx"/> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset 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,Wired Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voip_tx" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> </routes> </module> - <!-- A2DP Audio HAL --> - <xi:include href="a2dp_audio_policy_configuration.xml"/> + <!-- A2DP Input Audio HAL --> + <xi:include href="a2dp_in_audio_policy_configuration.xml"/> <!-- Usb Audio HAL --> <module name="usb" halVersion="2.0"> @@ -197,8 +211,8 @@ <!-- Remote Submix Audio HAL --> <xi:include href="r_submix_audio_policy_configuration.xml"/> - <!-- Hearing aid Audio HAL --> - <xi:include href="hearing_aid_audio_policy_configuration.xml"/> + <!-- Bluetooth Audio HAL --> + <xi:include href="bluetooth_audio_policy_configuration.xml"/> </modules> diff --git a/audio_policy_configuration_bluetooth_hal_enabled.xml b/audio_policy_configuration_bluetooth_legacy_hal.xml index 7ad24ee0..cf68c9b8 100644 --- a/audio_policy_configuration_bluetooth_hal_enabled.xml +++ b/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -130,21 +130,6 @@ </devicePort> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> </devicePort> - <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" - encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink" - encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink" - encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source"> </devicePort> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> @@ -197,17 +182,11 @@ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voip_tx" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> - <route type="mix" sink="BT A2DP Out" - sources="primary output,deep_buffer,compressed_offload"/> - <route type="mix" sink="BT A2DP Headphones" - sources="primary output,deep_buffer,compressed_offload"/> - <route type="mix" sink="BT A2DP Speaker" - sources="primary output,deep_buffer,compressed_offload"/> </routes> </module> - <!-- A2DP Input Audio HAL --> - <xi:include href="a2dp_in_audio_policy_configuration.xml"/> + <!-- A2DP Audio HAL --> + <xi:include href="a2dp_audio_policy_configuration.xml"/> <!-- Usb Audio HAL --> <module name="usb" halVersion="2.0"> @@ -232,8 +211,8 @@ <!-- Remote Submix Audio HAL --> <xi:include href="r_submix_audio_policy_configuration.xml"/> - <!-- Bluetooth Audio HAL for Hearing aid --> - <xi:include href="bluetooth_hearing_aid_audio_policy_configuration.xml"/> + <!-- Hearing aid Audio HAL --> + <xi:include href="hearing_aid_audio_policy_configuration.xml"/> </modules> @@ -548,15 +548,16 @@ endif PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - $(LOCAL_PATH)/audio_policy_configuration_bluetooth_hal_enabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_hal_enabled.xml \ - $(LOCAL_PATH)/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ $(LOCAL_PATH)/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \ $(LOCAL_PATH)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ - frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml # Audio XMLs PRODUCT_COPY_FILES += \ |