sm7125-common: switch to AOSP Bluetooth implementation
Signed-off-by: debdeep199x <debdeep199x@gmail.com>
This commit is contained in:
@@ -54,7 +54,8 @@ USE_XML_AUDIO_POLICY_CONF := 1
|
|||||||
|
|
||||||
# Bluetooth
|
# Bluetooth
|
||||||
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth/include
|
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth/include
|
||||||
TARGET_USE_QTI_BT_STACK := true
|
#TARGET_USE_QTI_BT_STACK := true
|
||||||
|
BOARD_HAVE_BLUETOOTH_QCOM := true
|
||||||
|
|
||||||
# Bootloader
|
# Bootloader
|
||||||
TARGET_NO_BOOTLOADER := true
|
TARGET_NO_BOOTLOADER := true
|
||||||
|
|||||||
25
audio/vendor/audio_policy_configuration.xml
vendored
25
audio/vendor/audio_policy_configuration.xml
vendored
@@ -271,21 +271,6 @@
|
|||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</devicePort>
|
</devicePort>
|
||||||
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
|
|
||||||
encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
|
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
|
||||||
</devicePort>
|
|
||||||
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
|
|
||||||
encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
|
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
|
||||||
</devicePort>
|
|
||||||
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
|
|
||||||
encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
|
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
|
||||||
</devicePort>
|
|
||||||
<devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
|
<devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
|
samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
|
||||||
@@ -402,12 +387,6 @@
|
|||||||
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,Wired 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,Wired Headset 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="BT A2DP Out"
|
|
||||||
sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
|
|
||||||
<route type="mix" sink="BT A2DP Headphones"
|
|
||||||
sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
|
|
||||||
<route type="mix" sink="BT A2DP Speaker"
|
|
||||||
sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
|
|
||||||
<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="fast input"
|
<route type="mix" sink="fast input"
|
||||||
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
|
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
|
||||||
@@ -505,6 +484,10 @@
|
|||||||
<!-- Remote Submix Audio HAL -->
|
<!-- Remote Submix Audio HAL -->
|
||||||
<xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
|
<xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
|
||||||
|
|
||||||
|
<!-- Bluetooth Audio HAL -->
|
||||||
|
<xi:include href="/vendor/etc/bluetooth_audio_policy_configuration.xml"/>
|
||||||
|
|
||||||
|
|
||||||
</modules>
|
</modules>
|
||||||
<!-- End of Modules section -->
|
<!-- End of Modules section -->
|
||||||
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
|
|
||||||
<module name="bluetooth_qti" halVersion="2.0">
|
|
||||||
<mixPorts>
|
|
||||||
<!-- A2DP Audio Ports -->
|
|
||||||
<mixPort name="a2dp output" role="source"/>
|
|
||||||
<!-- Hearing AIDs Audio Ports -->
|
|
||||||
<mixPort name="hearing aid output" role="source">
|
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
|
||||||
samplingRates="24000,16000"
|
|
||||||
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
|
||||||
</mixPort>
|
|
||||||
</mixPorts>
|
|
||||||
<devicePorts>
|
|
||||||
<!-- A2DP Audio Ports -->
|
|
||||||
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
|
|
||||||
<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">
|
|
||||||
<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">
|
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
|
||||||
samplingRates="44100,48000,88200,96000"
|
|
||||||
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
|
||||||
</devicePort>
|
|
||||||
<!-- Hearing AIDs Audio Ports -->
|
|
||||||
<devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
|
|
||||||
</devicePorts>
|
|
||||||
<routes>
|
|
||||||
<route type="mix" sink="BT A2DP Out"
|
|
||||||
sources="a2dp output"/>
|
|
||||||
<route type="mix" sink="BT A2DP Headphones"
|
|
||||||
sources="a2dp output"/>
|
|
||||||
<route type="mix" sink="BT A2DP Speaker"
|
|
||||||
sources="a2dp output"/>
|
|
||||||
<route type="mix" sink="BT Hearing Aid Out"
|
|
||||||
sources="hearing aid output"/>
|
|
||||||
</routes>
|
|
||||||
</module>
|
|
||||||
@@ -64,11 +64,8 @@ static inline const char *BtmGetDefaultName()
|
|||||||
#define BTM_DEF_LOCAL_NAME BtmGetDefaultName()
|
#define BTM_DEF_LOCAL_NAME BtmGetDefaultName()
|
||||||
// Disables read remote device feature
|
// Disables read remote device feature
|
||||||
#define MAX_ACL_CONNECTIONS 16
|
#define MAX_ACL_CONNECTIONS 16
|
||||||
#define MAX_L2CAP_CHANNELS 32
|
#define MAX_L2CAP_CHANNELS 16
|
||||||
#define BLE_VND_INCLUDED TRUE
|
#define BLE_VND_INCLUDED TRUE
|
||||||
#define GATT_MAX_PHY_CHANNEL 10
|
#define AVDT_NUM_SEPS 12
|
||||||
// Skips conn update at conn completion
|
|
||||||
#define BT_CLEAN_TURN_ON_DISABLED 1
|
|
||||||
#define AVDT_NUM_SEPS 35
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -50,7 +50,9 @@ PRODUCT_COPY_FILES += \
|
|||||||
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:/$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:/$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
||||||
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:/$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
|
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:/$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.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/r_submix_audio_policy_configuration.xml:/$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_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/usb_audio_policy_configuration.xml:/$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
|
||||||
|
frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:/$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml
|
||||||
|
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(call find-copy-subdir-files,*,$(LOCAL_PATH)/audio/odm/,$(TARGET_COPY_OUT_ODM)/etc) \
|
$(call find-copy-subdir-files,*,$(LOCAL_PATH)/audio/odm/,$(TARGET_COPY_OUT_ODM)/etc) \
|
||||||
|
|||||||
20
system.prop
20
system.prop
@@ -12,25 +12,7 @@ ro.qc.sdk.audio.fluencetype=none
|
|||||||
|
|
||||||
# Bluetooth
|
# Bluetooth
|
||||||
vendor.bluetooth.soc=cherokee
|
vendor.bluetooth.soc=cherokee
|
||||||
persist.vendor.bt.a2dp.aac_whitelist=false
|
ro.bluetooth.library_name=libbluetooth.so
|
||||||
persist.vendor.btstack.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aptxadaptive-aac-ldac
|
|
||||||
persist.vendor.btstack.enable.splita2dp=true
|
|
||||||
persist.vendor.btstack.enable.twsplus=true
|
|
||||||
persist.vendor.btstack.enable.twsplussho=true
|
|
||||||
ro.bluetooth.library_name=libbluetooth_qti.so
|
|
||||||
persist.bluetooth.bqr.event_mask=0x8000000E
|
|
||||||
persist.bluetooth.bqr.min_interval_ms=60000
|
|
||||||
persist.bluetooth.bqr.choppy_threshold=9,6
|
|
||||||
persist.bluetooth.disableabsvol=false
|
|
||||||
persist.vendor.service.bt.iot.enablelogging=true
|
|
||||||
persist.vendor.bluetooth.a2dp.hal.implementation=true
|
|
||||||
persist.vendor.bt.a2dp.hal.implementation=true
|
|
||||||
persist.bluetooth.disableinbandringing=false
|
|
||||||
persist.bluetooth.specificatcmdsenable=true
|
|
||||||
persist.vendor.bluetooth.modem_nv_support=true
|
|
||||||
persist.vendor.service.bdroid.soc.alwayson=true
|
|
||||||
persist.vendor.service.bt.iotinfo.report.enable=true
|
|
||||||
persist.vendor.btstack.aac_frm_ctl.enabled=true
|
|
||||||
|
|
||||||
# Camera
|
# Camera
|
||||||
ro.camera.hfr.enable=1
|
ro.camera.hfr.enable=1
|
||||||
|
|||||||
10
vendor.prop
10
vendor.prop
@@ -38,7 +38,7 @@ aaudio.mmap_exclusive_policy=2
|
|||||||
aaudio.hw_burst_min_usec=2000
|
aaudio.hw_burst_min_usec=2000
|
||||||
vendor.audio.enable.mirrorlink=false
|
vendor.audio.enable.mirrorlink=false
|
||||||
persist.vendor.audio.voicecall.speaker.stereo=true
|
persist.vendor.audio.voicecall.speaker.stereo=true
|
||||||
vendor.audio.feature.a2dp_offload.enable=true
|
vendor.audio.feature.a2dp_offload.enable=false
|
||||||
vendor.audio.feature.afe_proxy.enable=true
|
vendor.audio.feature.afe_proxy.enable=true
|
||||||
vendor.audio.feature.anc_headset.enable=true
|
vendor.audio.feature.anc_headset.enable=true
|
||||||
vendor.audio.feature.battery_listener.enable=true
|
vendor.audio.feature.battery_listener.enable=true
|
||||||
@@ -86,16 +86,14 @@ vendor.audio.feature.snd_mon.enable=true
|
|||||||
|
|
||||||
# Bluetooth
|
# Bluetooth
|
||||||
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
|
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
|
||||||
persist.bluetooth.a2dp_offload.disabled=false
|
persist.bluetooth.a2dp_offload.disabled=true
|
||||||
persist.vendor.bt.aac_frm_ctl.enabled=true
|
|
||||||
persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptive
|
persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptive
|
||||||
persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
|
|
||||||
persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=false
|
persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=false
|
||||||
persist.vendor.qcom.bluetooth.enable.splita2dp=true
|
persist.vendor.qcom.bluetooth.enable.splita2dp=false
|
||||||
persist.vendor.qcom.bluetooth.scram.enabled=true
|
persist.vendor.qcom.bluetooth.scram.enabled=true
|
||||||
persist.vendor.qcom.bluetooth.soc=cherokee
|
persist.vendor.qcom.bluetooth.soc=cherokee
|
||||||
persist.vendor.qcom.bluetooth.twsp_state.enabled=false
|
persist.vendor.qcom.bluetooth.twsp_state.enabled=false
|
||||||
ro.bluetooth.a2dp_offload.supported=true
|
ro.bluetooth.a2dp_offload.supported=false
|
||||||
ro.vendor.bluetooth.wipower=false
|
ro.vendor.bluetooth.wipower=false
|
||||||
vendor.qcom.bluetooth.soc=cherokee
|
vendor.qcom.bluetooth.soc=cherokee
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user