Merge "hal: Fix race condition in parsing platform info xml"
diff --git a/configs/atoll/atoll.mk b/configs/atoll/atoll.mk
index 93d4cc9..9edaee7 100644
--- a/configs/atoll/atoll.mk
+++ b/configs/atoll/atoll.mk
@@ -105,6 +105,70 @@
DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
endif
+ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)
+BOARD_VENDOR_KERNEL_MODULES := \
+ $(KERNEL_MODULES_OUT)/audio_apr.ko \
+ $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \
+ $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \
+ $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \
+ $(KERNEL_MODULES_OUT)/audio_q6.ko \
+ $(KERNEL_MODULES_OUT)/audio_usf.ko \
+ $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \
+ $(KERNEL_MODULES_OUT)/audio_swr.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \
+ $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \
+ $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \
+ $(KERNEL_MODULES_OUT)/audio_platform.ko \
+ $(KERNEL_MODULES_OUT)/audio_hdmi.ko \
+ $(KERNEL_MODULES_OUT)/audio_stub.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \
+ $(KERNEL_MODULES_OUT)/audio_mbhc.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd937x.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd937x_slave.ko \
+ $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \
+ $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \
+ $(KERNEL_MODULES_OUT)/audio_va_macro.ko \
+ $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \
+ $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \
+ $(KERNEL_MODULES_OUT)/audio_native.ko \
+ $(KERNEL_MODULES_OUT)/audio_machine_atoll.ko \
+ $(KERNEL_MODULES_OUT)/audio_snd_event.ko
+endif
+
+#Audio DLKM
+AUDIO_DLKM := audio_apr.ko
+AUDIO_DLKM += audio_q6_pdr.ko
+AUDIO_DLKM += audio_q6_notifier.ko
+AUDIO_DLKM += audio_adsp_loader.ko
+AUDIO_DLKM += audio_q6.ko
+AUDIO_DLKM += audio_usf.ko
+AUDIO_DLKM += audio_pinctrl_lpi.ko
+AUDIO_DLKM += audio_swr.ko
+AUDIO_DLKM += audio_wcd_core.ko
+AUDIO_DLKM += audio_swr_ctrl.ko
+AUDIO_DLKM += audio_wsa881x.ko
+AUDIO_DLKM += audio_platform.ko
+AUDIO_DLKM += audio_hdmi.ko
+AUDIO_DLKM += audio_stub.ko
+AUDIO_DLKM += audio_wcd9xxx.ko
+AUDIO_DLKM += audio_mbhc.ko
+AUDIO_DLKM += audio_native.ko
+AUDIO_DLKM += audio_wcd938x.ko
+AUDIO_DLKM += audio_wcd938x_slave.ko
+AUDIO_DLKM += audio_wcd937x.ko
+AUDIO_DLKM += audio_wcd937x_slave.ko
+AUDIO_DLKM += audio_bolero_cdc.ko
+AUDIO_DLKM += audio_wsa_macro.ko
+AUDIO_DLKM += audio_va_macro.ko
+AUDIO_DLKM += audio_rx_macro.ko
+AUDIO_DLKM += audio_tx_macro.ko
+AUDIO_DLKM += audio_machine_atoll.ko
+AUDIO_DLKM += audio_snd_event.ko
+
+PRODUCT_PACKAGES += $(AUDIO_DLKM)
+
PRODUCT_COPY_FILES += \
vendor/qcom/opensource/audio-hal/primary-hal/configs/atoll/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
vendor/qcom/opensource/audio-hal/primary-hal/configs/atoll/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
diff --git a/configs/atoll/mixer_paths_qrd.xml b/configs/atoll/mixer_paths_qrd.xml
index 1aef816..bfa2a6d 100644
--- a/configs/atoll/mixer_paths_qrd.xml
+++ b/configs/atoll/mixer_paths_qrd.xml
@@ -3168,6 +3168,24 @@
<path name="three-mic" />
</path>
+ <path name="three-mic">
+ <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+ <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX0" value="ADC0" />
+ <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX1" value="ADC1" />
+ <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC2 MUX" value="INP3" />
+ <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX2" value="ADC2" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC3 MUX" value="INP4" />
+ </path>
+
<path name="speaker-tmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
<ctl name="TX DEC0 MUX" value="SWR_MIC" />
diff --git a/configs/kona/mixer_paths_qrd.xml b/configs/kona/mixer_paths_qrd.xml
index c36f11f..f76d7bd 100644
--- a/configs/kona/mixer_paths_qrd.xml
+++ b/configs/kona/mixer_paths_qrd.xml
@@ -3079,6 +3079,16 @@
<path name="three-mic" />
</path>
+ <path name="three-mic">
+ <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+ <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+ <ctl name="TX DMIC MUX3" value="DMIC1" />
+ <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+ <ctl name="TX DMIC MUX1" value="DMIC3" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC2" />
+ </path>
+
<path name="speaker-tmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
diff --git a/configs/lito/mixer_paths_qrd.xml b/configs/lito/mixer_paths_qrd.xml
index e2a6bcd..5ac7521 100644
--- a/configs/lito/mixer_paths_qrd.xml
+++ b/configs/lito/mixer_paths_qrd.xml
@@ -3275,6 +3275,16 @@
<path name="three-mic" />
</path>
+ <path name="three-mic">
+ <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
+ <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+ <ctl name="TX DMIC MUX3" value="DMIC1" />
+ <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+ <ctl name="TX DMIC MUX1" value="DMIC3" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC2" />
+ </path>
+
<path name="speaker-tmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
diff --git a/configs/msmnile_au/audio_platform_info.xml b/configs/msmnile_au/audio_platform_info.xml
index 55f0d66..4fdf786 100644
--- a/configs/msmnile_au/audio_platform_info.xml
+++ b/configs/msmnile_au/audio_platform_info.xml
@@ -35,8 +35,8 @@
<device name="SND_DEVICE_OUT_BUS_NAV" acdb_id="14"/>
<device name="SND_DEVICE_OUT_BUS_PHN" acdb_id="94"/>
<device name="SND_DEVICE_OUT_BUS_RSE" acdb_id="60"/>
- <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="94"/>
- <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="94"/>
+ <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="21"/>
+ <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="39"/>
<device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="60"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>
@@ -49,8 +49,8 @@
<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="95"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="95"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="20"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="38"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>
<device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="80"/>
<device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>
@@ -111,10 +111,14 @@
<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="28" />
<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="28" />
<usecase name="USECASE_AUDIO_RECORD" type="in" id="0" />
- <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="36" />
- <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="36" />
- <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="36" />
- <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_DOWNLINK" type="in" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_DOWNLINK" type="out" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="in" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="out" id="36" />
</pcm_ids>
<config_params>
@@ -131,6 +135,7 @@
<param key="true_32_bit" value="true"/>
<!-- In the below value string, the value indicates sidetone gain in dB -->
<param key="usb_sidetone_gain" value="35"/>
+ <param key="hfp_pcm_dev_id" value="36"/>
</config_params>
<gain_db_to_level_mapping>
@@ -145,8 +150,8 @@
<device name="SND_DEVICE_OUT_HANDSET" interface="TERT_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER" interface="TERT_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES" interface="TERT_TDM_RX_0"/>
- <device name="SND_DEVICE_OUT_BT_SCO" interface="TERT_TDM_RX_2"/>
- <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="TERT_TDM_RX_2"/>
+ <device name="SND_DEVICE_OUT_BT_SCO" interface="AUX_PCM_RX"/>
+ <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="AUX_PCM_RX"/>
<device name="SND_DEVICE_OUT_BT_A2DP" interface="TERT_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="TERT_TDM_RX_2"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="TERT_TDM_RX_2"/>
@@ -163,8 +168,8 @@
<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" interface="TERT_TDM_TX_0"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="TERT_TDM_TX_0"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="TERT_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="AUX_PCM_TX"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="AUX_PCM_TX"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>
diff --git a/configs/msmnile_au/mixer_paths_adp.xml b/configs/msmnile_au/mixer_paths_adp.xml
index 02dd367..566f1e9 100644
--- a/configs/msmnile_au/mixer_paths_adp.xml
+++ b/configs/msmnile_au/mixer_paths_adp.xml
@@ -1601,8 +1601,6 @@
</path>
<path name="hfp-sco">
- <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
- <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
@@ -1630,20 +1628,38 @@
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco bt-sco">
+ <path name="hfp-sco" />
+ </path>
+
<path name="hfp-sco-wb">
- <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
<ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb bt-sco-wb">
+ <path name="hfp-sco-wb" />
+ </path>
+
<path name="hfp-sco-wb headphones">
<path name="hfp-sco headphones" />
</path>
+
<path name="hfp-sco-wb headset">
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco-downlink">
+ <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
+ <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
+ </path>
+
+ <path name="hfp-sco-wb-downlink">
+ <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
+ <path name="hfp-sco-downlink" />
+ </path>
+
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -2105,6 +2121,10 @@
<path name="speaker-mono" />
</path>
+ <path name="voice-speaker-hfp">
+ <path name="speaker-mono" />
+ </path>
+
<path name="voice-speaker-2">
<path name="speaker-mono-2" />
</path>
@@ -2121,6 +2141,10 @@
<path name="speaker-mic-qrd" />
</path>
+ <path name="voice-speaker-mic-hfp">
+ <path name="speaker-mic" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
</path>
diff --git a/configs/msmnile_au/mixer_paths_custom.xml b/configs/msmnile_au/mixer_paths_custom.xml
index 8ededba..2136c79 100644
--- a/configs/msmnile_au/mixer_paths_custom.xml
+++ b/configs/msmnile_au/mixer_paths_custom.xml
@@ -1589,8 +1589,6 @@
</path>
<path name="hfp-sco">
- <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
- <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
@@ -1618,20 +1616,38 @@
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco bt-sco">
+ <path name="hfp-sco" />
+ </path>
+
<path name="hfp-sco-wb">
- <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
<ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb bt-sco-wb">
+ <path name="hfp-sco-wb" />
+ </path>
+
<path name="hfp-sco-wb headphones">
<path name="hfp-sco headphones" />
</path>
+
<path name="hfp-sco-wb headset">
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco-downlink">
+ <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
+ <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
+ </path>
+
+ <path name="hfp-sco-wb-downlink">
+ <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
+ <path name="hfp-sco-downlink" />
+ </path>
+
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -2093,6 +2109,10 @@
<path name="speaker-mono" />
</path>
+ <path name="voice-speaker-hfp">
+ <path name="speaker-mono" />
+ </path>
+
<path name="voice-speaker-2">
<path name="speaker-mono-2" />
</path>
@@ -2109,6 +2129,10 @@
<path name="speaker-mic-qrd" />
</path>
+ <path name="voice-speaker-mic-hfp">
+ <path name="speaker-mic" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
</path>
diff --git a/configs/msmsteppe_au/audio_platform_info.xml b/configs/msmsteppe_au/audio_platform_info.xml
index 55f0d66..4fdf786 100644
--- a/configs/msmsteppe_au/audio_platform_info.xml
+++ b/configs/msmsteppe_au/audio_platform_info.xml
@@ -35,8 +35,8 @@
<device name="SND_DEVICE_OUT_BUS_NAV" acdb_id="14"/>
<device name="SND_DEVICE_OUT_BUS_PHN" acdb_id="94"/>
<device name="SND_DEVICE_OUT_BUS_RSE" acdb_id="60"/>
- <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="94"/>
- <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="94"/>
+ <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="21"/>
+ <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="39"/>
<device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="60"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>
@@ -49,8 +49,8 @@
<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="95"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="95"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="20"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="38"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>
<device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="80"/>
<device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>
@@ -111,10 +111,14 @@
<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="28" />
<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="28" />
<usecase name="USECASE_AUDIO_RECORD" type="in" id="0" />
- <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="36" />
- <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="36" />
- <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="36" />
- <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="29" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_DOWNLINK" type="in" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_DOWNLINK" type="out" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="in" id="36" />
+ <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="out" id="36" />
</pcm_ids>
<config_params>
@@ -131,6 +135,7 @@
<param key="true_32_bit" value="true"/>
<!-- In the below value string, the value indicates sidetone gain in dB -->
<param key="usb_sidetone_gain" value="35"/>
+ <param key="hfp_pcm_dev_id" value="36"/>
</config_params>
<gain_db_to_level_mapping>
@@ -145,8 +150,8 @@
<device name="SND_DEVICE_OUT_HANDSET" interface="TERT_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER" interface="TERT_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES" interface="TERT_TDM_RX_0"/>
- <device name="SND_DEVICE_OUT_BT_SCO" interface="TERT_TDM_RX_2"/>
- <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="TERT_TDM_RX_2"/>
+ <device name="SND_DEVICE_OUT_BT_SCO" interface="AUX_PCM_RX"/>
+ <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="AUX_PCM_RX"/>
<device name="SND_DEVICE_OUT_BT_A2DP" interface="TERT_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="TERT_TDM_RX_2"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="TERT_TDM_RX_2"/>
@@ -163,8 +168,8 @@
<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" interface="TERT_TDM_TX_0"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="TERT_TDM_TX_0"/>
- <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="TERT_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="AUX_PCM_TX"/>
+ <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="AUX_PCM_TX"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>
diff --git a/configs/msmsteppe_au/mixer_paths_adp.xml b/configs/msmsteppe_au/mixer_paths_adp.xml
index 6cebd13..7622dd8 100644
--- a/configs/msmsteppe_au/mixer_paths_adp.xml
+++ b/configs/msmsteppe_au/mixer_paths_adp.xml
@@ -1372,8 +1372,6 @@
</path>
<path name="hfp-sco">
- <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
- <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
@@ -1397,16 +1395,33 @@
<path name="hfp-sco headphones">
</path>
+ <path name="hfp-sco bt-sco">
+ <path name="hfp-sco" />
+ </path>
+
<path name="hfp-sco-wb">
- <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
<ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb bt-sco-wb">
+ <path name="hfp-sco-wb" />
+ </path>
+
<path name="hfp-sco-wb headphones">
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco-downlink">
+ <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
+ <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
+ </path>
+
+ <path name="hfp-sco-wb-downlink">
+ <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
+ <path name="hfp-sco-downlink" />
+ </path>
+
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -1831,6 +1846,10 @@
<path name="speaker-mono" />
</path>
+ <path name="voice-speaker-hfp">
+ <path name="speaker-mono" />
+ </path>
+
<path name="voice-speaker-2">
<path name="speaker-mono-2" />
</path>
@@ -1847,6 +1866,10 @@
<path name="speaker-mic-qrd" />
</path>
+ <path name="voice-speaker-mic-hfp">
+ <path name="speaker-mic" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
</path>
diff --git a/configs/msmsteppe_au/mixer_paths_custom.xml b/configs/msmsteppe_au/mixer_paths_custom.xml
index 8620565..dd0da54 100644
--- a/configs/msmsteppe_au/mixer_paths_custom.xml
+++ b/configs/msmsteppe_au/mixer_paths_custom.xml
@@ -1361,8 +1361,6 @@
</path>
<path name="hfp-sco">
- <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
- <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
@@ -1386,16 +1384,33 @@
<path name="hfp-sco headphones">
</path>
+ <path name="hfp-sco bt-sco">
+ <path name="hfp-sco" />
+ </path>
+
<path name="hfp-sco-wb">
- <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
<ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb bt-sco-wb">
+ <path name="hfp-sco-wb" />
+ </path>
+
<path name="hfp-sco-wb headphones">
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco-downlink">
+ <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
+ <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
+ </path>
+
+ <path name="hfp-sco-wb-downlink">
+ <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
+ <path name="hfp-sco-downlink" />
+ </path>
+
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -1820,6 +1835,10 @@
<path name="speaker-mono" />
</path>
+ <path name="voice-speaker-hfp">
+ <path name="speaker-mono" />
+ </path>
+
<path name="voice-speaker-2">
<path name="speaker-mono-2" />
</path>
@@ -1836,6 +1855,10 @@
<path name="speaker-mic-qrd" />
</path>
+ <path name="voice-speaker-mic-hfp">
+ <path name="speaker-mic" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
</path>
diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index 7601124..ccc1b2e 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -476,6 +476,10 @@
MULTIPLE_HW_VARIANTS_ENABLED := true
endif
+ifeq ($(TARGET_BOARD_AUTO),true)
+ LOCAL_CFLAGS += -DPLATFORM_AUTO
+endif
+
LOCAL_SRC_FILES:= \
hfp.c
diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
index f324ee1..bb3437a 100644
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -4511,6 +4511,10 @@
init_config.fp_disable_audio_route = disable_audio_route;
init_config.fp_disable_snd_device = disable_snd_device;
init_config.fp_voice_get_mic_mute = voice_get_mic_mute;
+ init_config.fp_audio_extn_auto_hal_start_hfp_downlink =
+ audio_extn_auto_hal_start_hfp_downlink;
+ init_config.fp_audio_extn_auto_hal_stop_hfp_downlink =
+ audio_extn_auto_hal_stop_hfp_downlink;
hfp_init(init_config);
ALOGD("%s:: ---- Feature HFP is Enabled ----", __func__);
@@ -5463,10 +5467,6 @@
typedef bool (*auto_hal_is_bus_device_usecase_t)(audio_usecase_t);
static auto_hal_is_bus_device_usecase_t auto_hal_is_bus_device_usecase;
-typedef snd_device_t (*auto_hal_get_snd_device_for_car_audio_stream_t)(
- struct stream_out*);
-static auto_hal_get_snd_device_for_car_audio_stream_t auto_hal_get_snd_device_for_car_audio_stream;
-
typedef int (*auto_hal_get_audio_port_t)(struct audio_hw_device*,
struct audio_port*);
static auto_hal_get_audio_port_t auto_hal_get_audio_port;
@@ -5479,6 +5479,22 @@
struct str_parms*);
static auto_hal_set_parameters_t auto_hal_set_parameters;
+typedef int (*auto_hal_start_hfp_downlink_t)(struct audio_device*,
+ struct audio_usecase*);
+static auto_hal_start_hfp_downlink_t auto_hal_start_hfp_downlink;
+
+typedef int (*auto_hal_stop_hfp_downlink_t)(struct audio_device*,
+ struct audio_usecase*);
+static auto_hal_stop_hfp_downlink_t auto_hal_stop_hfp_downlink;
+
+typedef snd_device_t (*auto_hal_get_input_snd_device_t)(struct audio_device*,
+ audio_usecase_t);
+static auto_hal_get_input_snd_device_t auto_hal_get_input_snd_device;
+
+typedef snd_device_t (*auto_hal_get_output_snd_device_t)(struct audio_device*,
+ audio_usecase_t);
+static auto_hal_get_output_snd_device_t auto_hal_get_output_snd_device;
+
int auto_hal_feature_init(bool is_feature_enabled)
{
ALOGD("%s: Called with feature %s", __func__,
@@ -5511,9 +5527,6 @@
!(auto_hal_is_bus_device_usecase =
(auto_hal_is_bus_device_usecase_t)dlsym(
auto_hal_lib_handle, "auto_hal_is_bus_device_usecase")) ||
- !(auto_hal_get_snd_device_for_car_audio_stream =
- (auto_hal_get_snd_device_for_car_audio_stream_t)dlsym(
- auto_hal_lib_handle, "auto_hal_get_snd_device_for_car_audio_stream")) ||
!(auto_hal_get_audio_port =
(auto_hal_get_audio_port_t)dlsym(
auto_hal_lib_handle, "auto_hal_get_audio_port")) ||
@@ -5522,7 +5535,19 @@
auto_hal_lib_handle, "auto_hal_set_audio_port_config")) ||
!(auto_hal_set_parameters =
(auto_hal_set_parameters_t)dlsym(
- auto_hal_lib_handle, "auto_hal_set_parameters"))) {
+ auto_hal_lib_handle, "auto_hal_set_parameters")) ||
+ !(auto_hal_start_hfp_downlink =
+ (auto_hal_start_hfp_downlink_t)dlsym(
+ auto_hal_lib_handle, "auto_hal_start_hfp_downlink")) ||
+ !(auto_hal_stop_hfp_downlink =
+ (auto_hal_stop_hfp_downlink_t)dlsym(
+ auto_hal_lib_handle, "auto_hal_stop_hfp_downlink")) ||
+ !(auto_hal_get_input_snd_device =
+ (auto_hal_get_input_snd_device_t)dlsym(
+ auto_hal_lib_handle, "auto_hal_get_input_snd_device")) ||
+ !(auto_hal_get_output_snd_device =
+ (auto_hal_get_output_snd_device_t)dlsym(
+ auto_hal_lib_handle, "auto_hal_get_output_snd_device"))) {
ALOGE("%s: dlsym failed", __func__);
goto feature_disabled;
}
@@ -5543,10 +5568,13 @@
auto_hal_get_car_audio_stream_from_address = NULL;
auto_hal_open_output_stream = NULL;
auto_hal_is_bus_device_usecase = NULL;
- auto_hal_get_snd_device_for_car_audio_stream = NULL;
auto_hal_get_audio_port = NULL;
auto_hal_set_audio_port_config = NULL;
auto_hal_set_parameters = NULL;
+ auto_hal_start_hfp_downlink = NULL;
+ auto_hal_stop_hfp_downlink = NULL;
+ auto_hal_get_input_snd_device = NULL;
+ auto_hal_get_output_snd_device = NULL;
ALOGW(":: %s: ---- Feature AUTO_HAL is disabled ----", __func__);
return -ENOSYS;
@@ -5563,6 +5591,11 @@
auto_hal_init_config.fp_get_usecase_from_list = get_usecase_from_list;
auto_hal_init_config.fp_get_output_period_size = get_output_period_size;
auto_hal_init_config.fp_audio_extn_ext_hw_plugin_set_audio_gain = audio_extn_ext_hw_plugin_set_audio_gain;
+ auto_hal_init_config.fp_select_devices = select_devices;
+ auto_hal_init_config.fp_disable_audio_route = disable_audio_route;
+ auto_hal_init_config.fp_disable_snd_device = disable_snd_device;
+ auto_hal_init_config.fp_adev_get_active_input = adev_get_active_input;
+ auto_hal_init_config.fp_platform_set_echo_reference = platform_set_echo_reference;
return auto_hal_init(adev, auto_hal_init_config);
}
else
@@ -5601,25 +5634,19 @@
int audio_extn_auto_hal_get_car_audio_stream_from_address(const char *address)
{
return ((auto_hal_get_car_audio_stream_from_address) ?
- auto_hal_get_car_audio_stream_from_address(address): 0);
+ auto_hal_get_car_audio_stream_from_address(address): -ENOSYS);
}
int audio_extn_auto_hal_open_output_stream(struct stream_out *out)
{
return ((auto_hal_open_output_stream) ?
- auto_hal_open_output_stream(out): 0);
+ auto_hal_open_output_stream(out): -ENOSYS);
}
bool audio_extn_auto_hal_is_bus_device_usecase(audio_usecase_t uc_id)
{
return ((auto_hal_is_bus_device_usecase) ?
- auto_hal_is_bus_device_usecase(uc_id): 0);
-}
-
-snd_device_t audio_extn_auto_hal_get_snd_device_for_car_audio_stream(struct stream_out *out)
-{
- return ((auto_hal_get_snd_device_for_car_audio_stream) ?
- auto_hal_get_snd_device_for_car_audio_stream(out): 0);
+ auto_hal_is_bus_device_usecase(uc_id): false);
}
int audio_extn_auto_hal_get_audio_port(struct audio_hw_device *dev,
@@ -5642,6 +5669,34 @@
if (auto_hal_set_parameters)
auto_hal_set_parameters(adev, parms);
}
+
+int audio_extn_auto_hal_start_hfp_downlink(struct audio_device *adev,
+ struct audio_usecase *uc_info)
+{
+ return ((auto_hal_start_hfp_downlink) ?
+ auto_hal_start_hfp_downlink(adev, uc_info): 0);
+}
+
+int audio_extn_auto_hal_stop_hfp_downlink(struct audio_device *adev,
+ struct audio_usecase *uc_info)
+{
+ return ((auto_hal_stop_hfp_downlink) ?
+ auto_hal_stop_hfp_downlink(adev, uc_info): 0);
+}
+
+snd_device_t audio_extn_auto_hal_get_input_snd_device(struct audio_device *adev,
+ audio_usecase_t uc_id)
+{
+ return ((auto_hal_get_input_snd_device) ?
+ auto_hal_get_input_snd_device(adev, uc_id): SND_DEVICE_NONE);
+}
+
+snd_device_t audio_extn_auto_hal_get_output_snd_device(struct audio_device *adev,
+ audio_usecase_t uc_id)
+{
+ return ((auto_hal_get_output_snd_device) ?
+ auto_hal_get_output_snd_device(adev, uc_id): SND_DEVICE_NONE);
+}
// END: AUTO_HAL ===================================================================
void audio_extn_feature_init()
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index 91204a7..5402b81 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -682,6 +682,10 @@
struct audio_usecase *);
typedef int (*fp_disable_snd_device_t)(struct audio_device *, snd_device_t);
typedef bool (*fp_voice_get_mic_mute_t)(struct audio_device *);
+typedef int (*fp_audio_extn_auto_hal_start_hfp_downlink_t)(struct audio_device *,
+ struct audio_usecase *);
+typedef int (*fp_audio_extn_auto_hal_stop_hfp_downlink_t)(struct audio_device *,
+ struct audio_usecase *);
typedef struct hfp_init_config {
fp_platform_set_mic_mute_t fp_platform_set_mic_mute;
@@ -694,6 +698,8 @@
fp_disable_audio_route_t fp_disable_audio_route;
fp_disable_snd_device_t fp_disable_snd_device;
fp_voice_get_mic_mute_t fp_voice_get_mic_mute;
+ fp_audio_extn_auto_hal_start_hfp_downlink_t fp_audio_extn_auto_hal_start_hfp_downlink;
+ fp_audio_extn_auto_hal_stop_hfp_downlink_t fp_audio_extn_auto_hal_stop_hfp_downlink;
} hfp_init_config_t;
@@ -1309,18 +1315,26 @@
int audio_extn_auto_hal_get_car_audio_stream_from_address(const char *address);
int audio_extn_auto_hal_open_output_stream(struct stream_out *out);
bool audio_extn_auto_hal_is_bus_device_usecase(audio_usecase_t uc_id);
-snd_device_t audio_extn_auto_hal_get_snd_device_for_car_audio_stream(struct stream_out *out);
int audio_extn_auto_hal_get_audio_port(struct audio_hw_device *dev,
struct audio_port *config);
int audio_extn_auto_hal_set_audio_port_config(struct audio_hw_device *dev,
const struct audio_port_config *config);
void audio_extn_auto_hal_set_parameters(struct audio_device *adev,
struct str_parms *parms);
+int audio_extn_auto_hal_start_hfp_downlink(struct audio_device *adev,
+ struct audio_usecase *uc_info);
+int audio_extn_auto_hal_stop_hfp_downlink(struct audio_device *adev,
+ struct audio_usecase *uc_info);
+snd_device_t audio_extn_auto_hal_get_input_snd_device(struct audio_device *adev,
+ audio_usecase_t uc_id);
+snd_device_t audio_extn_auto_hal_get_output_snd_device(struct audio_device *adev,
+ audio_usecase_t uc_id);
typedef streams_input_ctxt_t* (*fp_in_get_stream_t)(struct audio_device*, audio_io_handle_t);
typedef streams_output_ctxt_t* (*fp_out_get_stream_t)(struct audio_device*, audio_io_handle_t);
typedef size_t (*fp_get_output_period_size_t)(uint32_t, audio_format_t, int, int);
typedef int (*fp_audio_extn_ext_hw_plugin_set_audio_gain_t)(void*, struct audio_usecase*, uint32_t);
+typedef struct stream_in* (*fp_adev_get_active_input_t)(const struct audio_device*);
typedef struct auto_hal_init_config {
fp_in_get_stream_t fp_in_get_stream;
@@ -1330,6 +1344,11 @@
fp_get_usecase_from_list_t fp_get_usecase_from_list;
fp_get_output_period_size_t fp_get_output_period_size;
fp_audio_extn_ext_hw_plugin_set_audio_gain_t fp_audio_extn_ext_hw_plugin_set_audio_gain;
+ fp_select_devices_t fp_select_devices;
+ fp_disable_audio_route_t fp_disable_audio_route;
+ fp_disable_snd_device_t fp_disable_snd_device;
+ fp_adev_get_active_input_t fp_adev_get_active_input;
+ fp_platform_set_echo_reference_t fp_platform_set_echo_reference;
} auto_hal_init_config_t;
// END: AUTO_HAL FEATURE ==================================================
diff --git a/hal/audio_extn/auto_hal.c b/hal/audio_extn/auto_hal.c
old mode 100644
new mode 100755
index c18b55f..84f578f
--- a/hal/audio_extn/auto_hal.c
+++ b/hal/audio_extn/auto_hal.c
@@ -54,12 +54,19 @@
static fp_get_usecase_from_list_t fp_get_usecase_from_list;
static fp_get_output_period_size_t fp_get_output_period_size;
static fp_audio_extn_ext_hw_plugin_set_audio_gain_t fp_audio_extn_ext_hw_plugin_set_audio_gain;
+static fp_select_devices_t fp_select_devices;
+static fp_disable_audio_route_t fp_disable_audio_route;
+static fp_disable_snd_device_t fp_disable_snd_device;
+static fp_adev_get_active_input_t fp_adev_get_active_input;
+static fp_platform_set_echo_reference_t fp_platform_set_echo_reference;
/* Auto hal module struct */
static struct auto_hal_module *auto_hal = NULL;
int auto_hal_release_audio_patch(struct audio_hw_device *dev,
audio_patch_handle_t handle);
+int auto_hal_stop_hfp_downlink(struct audio_device *adev,
+ struct audio_usecase *uc_info);
static struct audio_patch_record *get_patch_from_list(struct audio_device *adev,
audio_patch_handle_t patch_id)
@@ -151,6 +158,11 @@
sources->ext.device.address);
} else {
address = (char *)calloc(1, 1);
+ if (address == NULL) {
+ ALOGE("%s: failed to get address",__func__);
+ ret = -EFAULT;
+ goto error;
+ }
}
parms = str_parms_create_str(address);
if (!parms) {
@@ -185,6 +197,11 @@
sinks->ext.device.address);
} else {
address = (char *)calloc(1, 1);
+ if (address == NULL) {
+ ALOGE("%s: failed to get address",__func__);
+ ret = -EFAULT;
+ goto error;
+ }
}
parms = str_parms_create_str(address);
if (!parms) {
@@ -677,6 +694,236 @@
ALOGV("%s: exit", __func__);
}
+int auto_hal_start_hfp_downlink(struct audio_device *adev,
+ struct audio_usecase *uc_info)
+{
+ int32_t ret = 0;
+ struct audio_usecase *uc_downlink_info;
+
+ ALOGD("%s: enter", __func__);
+
+ uc_downlink_info = (struct audio_usecase *)calloc(1, sizeof(struct audio_usecase));
+
+ if (!uc_downlink_info)
+ return -ENOMEM;
+
+ uc_downlink_info->type = PCM_HFP_CALL;
+ uc_downlink_info->stream.out = adev->primary_output;
+ uc_downlink_info->devices = adev->primary_output->devices;
+ uc_downlink_info->in_snd_device = SND_DEVICE_NONE;
+ uc_downlink_info->out_snd_device = SND_DEVICE_NONE;
+
+ switch (uc_info->id) {
+ case USECASE_AUDIO_HFP_SCO:
+ uc_downlink_info->id = USECASE_AUDIO_HFP_SCO_DOWNLINK;
+ break;
+ case USECASE_AUDIO_HFP_SCO_WB:
+ uc_downlink_info->id = USECASE_AUDIO_HFP_SCO_WB_DOWNLINK;
+ break;
+ default:
+ ALOGE("%s: Invalid usecase %d", __func__, uc_info->id);
+ free(uc_downlink_info);
+ return -EINVAL;
+ }
+
+ list_add_tail(&adev->usecase_list, &uc_downlink_info->list);
+
+ ret = fp_select_devices(adev, uc_downlink_info->id);
+ if (ret) {
+ ALOGE("%s: Select devices failed %d", __func__, ret);
+ goto exit;
+ }
+
+ ALOGD("%s: exit: status(%d)", __func__, ret);
+ return 0;
+
+exit:
+ auto_hal_stop_hfp_downlink(adev, uc_info);
+ ALOGE("%s: Problem in start hfp downlink: status(%d)", __func__, ret);
+ return ret;
+}
+
+int auto_hal_stop_hfp_downlink(struct audio_device *adev,
+ struct audio_usecase *uc_info)
+{
+ int32_t ret = 0;
+ struct audio_usecase *uc_downlink_info;
+ audio_usecase_t ucid;
+
+ ALOGD("%s: enter", __func__);
+
+ switch (uc_info->id) {
+ case USECASE_AUDIO_HFP_SCO:
+ ucid = USECASE_AUDIO_HFP_SCO_DOWNLINK;
+ break;
+ case USECASE_AUDIO_HFP_SCO_WB:
+ ucid = USECASE_AUDIO_HFP_SCO_WB_DOWNLINK;
+ break;
+ default:
+ ALOGE("%s: Invalid usecase %d", __func__, uc_info->id);
+ return -EINVAL;
+ }
+
+ uc_downlink_info = fp_get_usecase_from_list(adev, ucid);
+ if (uc_downlink_info == NULL) {
+ ALOGE("%s: Could not find the usecase (%d) in the list",
+ __func__, ucid);
+ return -EINVAL;
+ }
+
+ /* Get and set stream specific mixer controls */
+ fp_disable_audio_route(adev, uc_downlink_info);
+
+ /* Disable the rx and tx devices */
+ fp_disable_snd_device(adev, uc_downlink_info->out_snd_device);
+ fp_disable_snd_device(adev, uc_downlink_info->in_snd_device);
+
+ list_remove(&uc_downlink_info->list);
+ free(uc_downlink_info);
+
+ ALOGD("%s: exit: status(%d)", __func__, ret);
+ return ret;
+}
+
+snd_device_t auto_hal_get_input_snd_device(struct audio_device *adev,
+ audio_usecase_t uc_id)
+{
+ snd_device_t snd_device = SND_DEVICE_NONE;
+ audio_devices_t out_device = AUDIO_DEVICE_NONE;
+ struct audio_usecase *usecase = NULL;
+ struct stream_in *in = fp_adev_get_active_input(adev);
+ audio_devices_t in_device = ((in == NULL) ?
+ AUDIO_DEVICE_NONE : in->device)
+ & ~AUDIO_DEVICE_BIT_IN;
+
+ if (uc_id == USECASE_INVALID) {
+ ALOGE("%s: Invalid usecase (%d)", __func__, uc_id);
+ return -EINVAL;
+ }
+
+ usecase = fp_get_usecase_from_list(adev, uc_id);
+ if (usecase == NULL) {
+ ALOGE("%s: Could not find the usecase (%d)", __func__, uc_id);
+ return -EINVAL;
+ }
+
+ if (usecase->stream.out == NULL) {
+ ALOGE("%s: stream.out is NULL", __func__);
+ return -EINVAL;
+ }
+
+ out_device = usecase->stream.out->devices;
+ if (out_device == AUDIO_DEVICE_NONE ||
+ out_device & AUDIO_DEVICE_BIT_IN) {
+ ALOGE("%s: Invalid output devices (%#x)", __func__, out_device);
+ return -EINVAL;
+ }
+
+ ALOGV("%s: output device(%#x), input device(%#x), usecase(%d)",
+ __func__, out_device, in_device, uc_id);
+
+ if (out_device & AUDIO_DEVICE_OUT_BUS) {
+ /* usecase->id is token as judgement for HFP calls */
+ switch (usecase->id) {
+ case USECASE_AUDIO_HFP_SCO:
+ case USECASE_AUDIO_HFP_SCO_WB:
+ snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP;
+ if (adev->enable_hfp)
+ fp_platform_set_echo_reference(adev, true, out_device);
+ break;
+ case USECASE_AUDIO_HFP_SCO_DOWNLINK:
+ snd_device = SND_DEVICE_IN_BT_SCO_MIC;
+ break;
+ case USECASE_AUDIO_HFP_SCO_WB_DOWNLINK:
+ snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;
+ break;
+ case USECASE_VOICE_CALL:
+ snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC;
+ break;
+ default:
+ ALOGE("%s: Usecase (%d) not supported", __func__, uc_id);
+ return -EINVAL;
+ }
+ } else {
+ ALOGE("%s: Output devices (%#x) not supported", __func__, out_device);
+ return -EINVAL;
+ }
+
+ return snd_device;
+}
+
+snd_device_t auto_hal_get_output_snd_device(struct audio_device *adev,
+ audio_usecase_t uc_id)
+{
+ snd_device_t snd_device = SND_DEVICE_NONE;
+ audio_devices_t devices = AUDIO_DEVICE_NONE;
+ struct audio_usecase *usecase = NULL;
+
+ if (uc_id == USECASE_INVALID) {
+ ALOGE("%s: Invalid usecase (%d)", __func__, uc_id);
+ return -EINVAL;
+ }
+
+ usecase = fp_get_usecase_from_list(adev, uc_id);
+ if (usecase == NULL) {
+ ALOGE("%s: Could not find the usecase (%d)", __func__, uc_id);
+ return -EINVAL;
+ }
+
+ if (usecase->stream.out == NULL) {
+ ALOGE("%s: stream.out is NULL", __func__);
+ return -EINVAL;
+ }
+
+ devices = usecase->stream.out->devices;
+ if (devices == AUDIO_DEVICE_NONE ||
+ devices & AUDIO_DEVICE_BIT_IN) {
+ ALOGE("%s: Invalid output devices (%#x)", __func__, devices);
+ return -EINVAL;
+ }
+
+ ALOGV("%s: output devices(%#x), usecase(%d)", __func__, devices, uc_id);
+
+ if (devices & AUDIO_DEVICE_OUT_BUS) {
+ /* usecase->id is token as judgement for HFP calls */
+ switch (usecase->id) {
+ case USECASE_AUDIO_HFP_SCO:
+ snd_device = SND_DEVICE_OUT_BT_SCO;
+ break;
+ case USECASE_AUDIO_HFP_SCO_WB:
+ snd_device = SND_DEVICE_OUT_BT_SCO_WB;
+ break;
+ case USECASE_AUDIO_HFP_SCO_DOWNLINK:
+ case USECASE_AUDIO_HFP_SCO_WB_DOWNLINK:
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_HFP;
+ break;
+ case USECASE_VOICE_CALL:
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER;
+ break;
+ case USECASE_AUDIO_PLAYBACK_MEDIA:
+ snd_device = SND_DEVICE_OUT_BUS_MEDIA;
+ break;
+ case USECASE_AUDIO_PLAYBACK_SYS_NOTIFICATION:
+ snd_device = SND_DEVICE_OUT_BUS_SYS;
+ break;
+ case USECASE_AUDIO_PLAYBACK_NAV_GUIDANCE:
+ snd_device = SND_DEVICE_OUT_BUS_NAV;
+ break;
+ case USECASE_AUDIO_PLAYBACK_PHONE:
+ snd_device = SND_DEVICE_OUT_BUS_PHN;
+ break;
+ default:
+ ALOGE("%s: Usecase (%d) not supported", __func__, uc_id);
+ return -EINVAL;
+ }
+ } else {
+ ALOGE("%s: Output devices (%#x) not supported", __func__, devices);
+ return -EINVAL;
+ }
+
+ return snd_device;
+}
+
int auto_hal_init(struct audio_device *adev, auto_hal_init_config_t init_config)
{
int ret = 0;
@@ -704,6 +951,11 @@
fp_get_usecase_from_list = init_config.fp_get_usecase_from_list;
fp_get_output_period_size = init_config.fp_get_output_period_size;
fp_audio_extn_ext_hw_plugin_set_audio_gain = init_config.fp_audio_extn_ext_hw_plugin_set_audio_gain;
+ fp_select_devices = init_config.fp_select_devices;
+ fp_disable_audio_route = init_config.fp_disable_audio_route;
+ fp_disable_snd_device = init_config.fp_disable_snd_device;
+ fp_adev_get_active_input = init_config.fp_adev_get_active_input;
+ fp_platform_set_echo_reference = init_config.fp_platform_set_echo_reference;
return ret;
}
diff --git a/hal/audio_extn/ext_hw_plugin.c b/hal/audio_extn/ext_hw_plugin.c
index 7460caa..6e784cb 100644
--- a/hal/audio_extn/ext_hw_plugin.c
+++ b/hal/audio_extn/ext_hw_plugin.c
@@ -182,6 +182,8 @@
break;
case USECASE_AUDIO_HFP_SCO:
case USECASE_AUDIO_HFP_SCO_WB:
+ case USECASE_AUDIO_HFP_SCO_DOWNLINK:
+ case USECASE_AUDIO_HFP_SCO_WB_DOWNLINK:
*plugin_usecase = AUDIO_HAL_PLUGIN_USECASE_HFP_VOICE_CALL;
break;
case USECASE_VOICE_CALL:
diff --git a/hal/audio_extn/hfp.c b/hal/audio_extn/hfp.c
index 1088a0c..9b60083 100644
--- a/hal/audio_extn/hfp.c
+++ b/hal/audio_extn/hfp.c
@@ -125,6 +125,8 @@
static fp_disable_audio_route_t fp_disable_audio_route;
static fp_disable_snd_device_t fp_disable_snd_device;
static fp_voice_get_mic_mute_t fp_voice_get_mic_mute;
+static fp_audio_extn_auto_hal_start_hfp_downlink_t fp_audio_extn_auto_hal_start_hfp_downlink;
+static fp_audio_extn_auto_hal_stop_hfp_downlink_t fp_audio_extn_auto_hal_stop_hfp_downlink;
static int32_t hfp_set_volume(struct audio_device *adev, float value)
{
@@ -332,15 +334,6 @@
ALOGD("%s: HFP PCM devices (rx: %d tx: %d pcm dev id: %d) usecase(%d)",
__func__, pcm_dev_rx_id, pcm_dev_tx_id, hfpmod.hfp_pcm_dev_id, uc_info->id);
- hfpmod.hfp_sco_rx = pcm_open(adev->snd_card,
- pcm_dev_asm_rx_id,
- PCM_OUT, &pcm_config_hfp);
- if (hfpmod.hfp_sco_rx && !pcm_is_ready(hfpmod.hfp_sco_rx)) {
- ALOGE("%s: %s", __func__, pcm_get_error(hfpmod.hfp_sco_rx));
- ret = -EIO;
- goto exit;
- }
-
hfpmod.hfp_pcm_rx = pcm_open(adev->snd_card,
pcm_dev_rx_id,
PCM_OUT, &pcm_config_hfp);
@@ -350,15 +343,6 @@
goto exit;
}
- hfpmod.hfp_sco_tx = pcm_open(adev->snd_card,
- pcm_dev_asm_tx_id,
- PCM_IN, &pcm_config_hfp);
- if (hfpmod.hfp_sco_tx && !pcm_is_ready(hfpmod.hfp_sco_tx)) {
- ALOGE("%s: %s", __func__, pcm_get_error(hfpmod.hfp_sco_tx));
- ret = -EIO;
- goto exit;
- }
-
hfpmod.hfp_pcm_tx = pcm_open(adev->snd_card,
pcm_dev_tx_id,
PCM_IN, &pcm_config_hfp);
@@ -368,17 +352,6 @@
goto exit;
}
- if (pcm_start(hfpmod.hfp_sco_rx) < 0) {
- ALOGE("%s: pcm start for hfp sco rx failed", __func__);
- ret = -EINVAL;
- goto exit;
- }
- if (pcm_start(hfpmod.hfp_sco_tx) < 0) {
- ALOGE("%s: pcm start for hfp sco tx failed", __func__);
- ret = -EINVAL;
- goto exit;
- }
-
if (pcm_start(hfpmod.hfp_pcm_rx) < 0) {
ALOGE("%s: pcm start for hfp pcm rx failed", __func__);
ret = -EINVAL;
@@ -390,6 +363,38 @@
goto exit;
}
+ if (fp_audio_extn_auto_hal_start_hfp_downlink(adev, uc_info))
+ ALOGE("%s: start hfp downlink failed", __func__);
+
+ hfpmod.hfp_sco_rx = pcm_open(adev->snd_card,
+ pcm_dev_asm_rx_id,
+ PCM_OUT, &pcm_config_hfp);
+ if (hfpmod.hfp_sco_rx && !pcm_is_ready(hfpmod.hfp_sco_rx)) {
+ ALOGE("%s: %s", __func__, pcm_get_error(hfpmod.hfp_sco_rx));
+ ret = -EIO;
+ goto exit;
+ }
+
+ hfpmod.hfp_sco_tx = pcm_open(adev->snd_card,
+ pcm_dev_asm_tx_id,
+ PCM_IN, &pcm_config_hfp);
+ if (hfpmod.hfp_sco_tx && !pcm_is_ready(hfpmod.hfp_sco_tx)) {
+ ALOGE("%s: %s", __func__, pcm_get_error(hfpmod.hfp_sco_tx));
+ ret = -EIO;
+ goto exit;
+ }
+
+ if (pcm_start(hfpmod.hfp_sco_rx) < 0) {
+ ALOGE("%s: pcm start for hfp sco rx failed", __func__);
+ ret = -EINVAL;
+ goto exit;
+ }
+ if (pcm_start(hfpmod.hfp_sco_tx) < 0) {
+ ALOGE("%s: pcm start for hfp sco tx failed", __func__);
+ ret = -EINVAL;
+ goto exit;
+ }
+
hfpmod.is_hfp_running = true;
hfp_set_volume(adev, hfpmod.hfp_volume);
@@ -455,6 +460,9 @@
fp_disable_snd_device(adev, uc_info->out_snd_device);
fp_disable_snd_device(adev, uc_info->in_snd_device);
+ if (fp_audio_extn_auto_hal_stop_hfp_downlink(adev, uc_info))
+ ALOGE("%s: stop hfp downlink failed", __func__);
+
/* Set the unmute Tx mixer control */
if (fp_voice_get_mic_mute(adev)) {
fp_platform_set_mic_mute(adev->platform, false);
@@ -483,6 +491,10 @@
fp_disable_audio_route = init_config.fp_disable_audio_route;
fp_disable_snd_device = init_config.fp_disable_snd_device;
fp_voice_get_mic_mute = init_config.fp_voice_get_mic_mute;
+ fp_audio_extn_auto_hal_start_hfp_downlink =
+ init_config.fp_audio_extn_auto_hal_start_hfp_downlink;
+ fp_audio_extn_auto_hal_stop_hfp_downlink =
+ init_config.fp_audio_extn_auto_hal_stop_hfp_downlink;
}
bool hfp_is_active(struct audio_device *adev)
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index a29b6e5..b25fe3c 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -832,6 +832,25 @@
return adev->vr_audio_mode_enabled;
}
+static void audio_extn_btsco_get_sample_rate(int snd_device, int *sample_rate)
+{
+ switch (snd_device) {
+ case SND_DEVICE_OUT_BT_SCO:
+ case SND_DEVICE_IN_BT_SCO_MIC:
+ case SND_DEVICE_IN_BT_SCO_MIC_NREC:
+ *sample_rate = 8000;
+ break;
+ case SND_DEVICE_OUT_BT_SCO_WB:
+ case SND_DEVICE_IN_BT_SCO_MIC_WB:
+ case SND_DEVICE_IN_BT_SCO_MIC_WB_NREC:
+ *sample_rate = 16000;
+ break;
+ default:
+ ALOGD("%s:Not a BT SCO device, need not update sampling rate\n", __func__);
+ break;
+ }
+}
+
void audio_extn_utils_update_stream_app_type_cfg_for_usecase(
struct audio_device *adev,
struct audio_usecase *usecase)
@@ -880,31 +899,46 @@
&usecase->stream.inout->out_app_type_cfg);
ALOGV("%s Selected apptype: %d", __func__, usecase->stream.inout->out_app_type_cfg.app_type);
break;
+ case PCM_HFP_CALL:
+ switch (usecase->id) {
+ case USECASE_AUDIO_HFP_SCO:
+ case USECASE_AUDIO_HFP_SCO_WB:
+ audio_extn_btsco_get_sample_rate(usecase->out_snd_device,
+ &usecase->out_app_type_cfg.sample_rate);
+ usecase->in_app_type_cfg.sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ break;
+ case USECASE_AUDIO_HFP_SCO_DOWNLINK:
+ case USECASE_AUDIO_HFP_SCO_WB_DOWNLINK:
+ audio_extn_btsco_get_sample_rate(usecase->in_snd_device,
+ &usecase->in_app_type_cfg.sample_rate);
+ usecase->out_app_type_cfg.sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ break;
+ default:
+ ALOGE("%s: usecase id (%d) not supported, use default sample rate",
+ __func__, usecase->id);
+ usecase->in_app_type_cfg.sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ usecase->out_app_type_cfg.sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ break;
+ }
+ /* update out_app_type_cfg */
+ usecase->out_app_type_cfg.bit_width =
+ platform_get_snd_device_bit_width(usecase->out_snd_device);
+ usecase->out_app_type_cfg.app_type =
+ platform_get_default_app_type_v2(adev->platform, PCM_PLAYBACK);
+ /* update in_app_type_cfg */
+ usecase->in_app_type_cfg.bit_width =
+ platform_get_snd_device_bit_width(usecase->in_snd_device);
+ usecase->in_app_type_cfg.app_type =
+ platform_get_default_app_type_v2(adev->platform, PCM_CAPTURE);
+ ALOGV("%s Selected apptype: playback %d capture %d",
+ __func__, usecase->out_app_type_cfg.app_type, usecase->in_app_type_cfg.app_type);
+ break;
default:
ALOGE("%s: app type cfg not supported for usecase type (%d)",
__func__, usecase->type);
}
}
-void audio_extn_btsco_get_sample_rate(int snd_device, int *sample_rate)
-{
- switch (snd_device) {
- case SND_DEVICE_OUT_BT_SCO:
- case SND_DEVICE_IN_BT_SCO_MIC:
- case SND_DEVICE_IN_BT_SCO_MIC_NREC:
- *sample_rate = 8000;
- break;
- case SND_DEVICE_OUT_BT_SCO_WB:
- case SND_DEVICE_IN_BT_SCO_MIC_WB:
- case SND_DEVICE_IN_BT_SCO_MIC_WB_NREC:
- *sample_rate = 16000;
- break;
- default:
- ALOGD("%s:Not a BT SCO device, need not update sampling rate\n", __func__);
- break;
- }
-}
-
static int set_stream_app_type_mixer_ctrl(struct audio_device *adev,
int pcm_device_id, int app_type,
int acdb_dev_id, int sample_rate,
@@ -955,21 +989,27 @@
int pcm_device_id, acdb_dev_id = 0, snd_device = usecase->out_snd_device;
int32_t sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
int app_type = 0, rc = 0;
+ bool is_bus_dev_usecase = false;
ALOGV("%s", __func__);
if (usecase->type != PCM_HFP_CALL) {
- ALOGV("%s: not a playback or HFP path, no need to cfg app type", __func__);
+ ALOGV("%s: not a HFP path, no need to cfg app type", __func__);
rc = 0;
goto exit_send_app_type_cfg;
}
if ((usecase->id != USECASE_AUDIO_HFP_SCO) &&
- (usecase->id != USECASE_AUDIO_HFP_SCO_WB)) {
- ALOGV("%s: a playback path where app type cfg is not required", __func__);
+ (usecase->id != USECASE_AUDIO_HFP_SCO_WB) &&
+ (usecase->id != USECASE_AUDIO_HFP_SCO_DOWNLINK) &&
+ (usecase->id != USECASE_AUDIO_HFP_SCO_WB_DOWNLINK)) {
+ ALOGV("%s: a usecase where app type cfg is not required", __func__);
rc = 0;
goto exit_send_app_type_cfg;
}
+ if (usecase->devices & AUDIO_DEVICE_OUT_BUS)
+ is_bus_dev_usecase = true;
+
snd_device = usecase->out_snd_device;
pcm_device_id = platform_get_pcm_device_id(usecase->id, PCM_PLAYBACK);
@@ -983,24 +1023,47 @@
if (usecase->type == PCM_HFP_CALL) {
/* config HFP session:1 playback path */
- app_type = platform_get_default_app_type_v2(adev->platform, PCM_PLAYBACK);
- sample_rate= CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ if (is_bus_dev_usecase) {
+ app_type = usecase->out_app_type_cfg.app_type;
+ sample_rate= usecase->out_app_type_cfg.sample_rate;
+ } else {
+ snd_device = SND_DEVICE_NONE; // use legacy behavior
+ app_type = platform_get_default_app_type_v2(adev->platform, PCM_PLAYBACK);
+ sample_rate= CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ }
rc = set_stream_app_type_mixer_ctrl(adev, pcm_device_id, app_type,
acdb_dev_id, sample_rate,
PCM_PLAYBACK,
- SND_DEVICE_NONE); // use legacy behavior
+ snd_device);
if (rc < 0)
goto exit_send_app_type_cfg;
/* config HFP session:1 capture path */
- app_type = platform_get_default_app_type_v2(adev->platform, PCM_CAPTURE);
+ if (is_bus_dev_usecase) {
+ snd_device = usecase->in_snd_device;
+ pcm_device_id = platform_get_pcm_device_id(usecase->id, PCM_CAPTURE);
+ acdb_dev_id = platform_get_snd_device_acdb_id(snd_device);
+ if (acdb_dev_id < 0) {
+ ALOGE("%s: Couldn't get the acdb dev id", __func__);
+ rc = -EINVAL;
+ goto exit_send_app_type_cfg;
+ }
+ app_type = usecase->in_app_type_cfg.app_type;
+ sample_rate= usecase->in_app_type_cfg.sample_rate;
+ } else {
+ snd_device = SND_DEVICE_NONE; // use legacy behavior
+ app_type = platform_get_default_app_type_v2(adev->platform, PCM_CAPTURE);
+ }
rc = set_stream_app_type_mixer_ctrl(adev, pcm_device_id, app_type,
acdb_dev_id, sample_rate,
PCM_CAPTURE,
- SND_DEVICE_NONE);
+ snd_device);
if (rc < 0)
goto exit_send_app_type_cfg;
+ if (is_bus_dev_usecase)
+ goto exit_send_app_type_cfg;
+
/* config HFP session:2 capture path */
pcm_device_id = HFP_ASM_RX_TX;
snd_device = usecase->in_snd_device;
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index b0a43b2..0580353 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -357,8 +357,10 @@
[USECASE_AUDIO_HFP_SCO] = "hfp-sco",
[USECASE_AUDIO_HFP_SCO_WB] = "hfp-sco-wb",
- [USECASE_VOICE_CALL] = "voice-call",
+ [USECASE_AUDIO_HFP_SCO_DOWNLINK] = "hfp-sco-downlink",
+ [USECASE_AUDIO_HFP_SCO_WB_DOWNLINK] = "hfp-sco-wb-downlink",
+ [USECASE_VOICE_CALL] = "voice-call",
[USECASE_VOICE2_CALL] = "voice2-call",
[USECASE_VOLTE_CALL] = "volte-call",
[USECASE_QCHAT_CALL] = "qchat-call",
@@ -511,6 +513,8 @@
static void in_snd_mon_cb(void * stream, struct str_parms * parms);
static void out_snd_mon_cb(void * stream, struct str_parms * parms);
+static int configure_btsco_sample_rate(snd_device_t snd_device);
+
#ifdef AUDIO_FEATURE_ENABLED_GCOV
extern void __gcov_flush();
static void enable_gcov()
@@ -1303,6 +1307,7 @@
goto err;
}
+ configure_btsco_sample_rate(snd_device);
/* due to the possibility of calibration overwrite between listen
and audio, notify listen hal before audio calibration is sent */
audio_extn_sound_trigger_update_device_status(snd_device,
@@ -2310,6 +2315,50 @@
return bt_soc_status;
}
+static int configure_btsco_sample_rate(snd_device_t snd_device)
+{
+ struct mixer_ctl *ctl = NULL;
+ struct mixer_ctl *ctl_sr_rx = NULL, *ctl_sr_tx = NULL, *ctl_sr = NULL;
+ char *rate_str = NULL;
+ bool is_rx_dev = true;
+
+ if (is_btsco_device(snd_device, snd_device)) {
+ ctl_sr_tx = mixer_get_ctl_by_name(adev->mixer, "BT SampleRate TX");
+ ctl_sr_rx = mixer_get_ctl_by_name(adev->mixer, "BT SampleRate RX");
+ if (!ctl_sr_tx || !ctl_sr_rx) {
+ ctl_sr = mixer_get_ctl_by_name(adev->mixer, "BT SampleRate");
+ if (!ctl_sr)
+ return -ENOSYS;
+ }
+
+ switch (snd_device) {
+ case SND_DEVICE_OUT_BT_SCO:
+ rate_str = "KHZ_8";
+ break;
+ case SND_DEVICE_IN_BT_SCO_MIC_NREC:
+ case SND_DEVICE_IN_BT_SCO_MIC:
+ rate_str = "KHZ_8";
+ is_rx_dev = false;
+ break;
+ case SND_DEVICE_OUT_BT_SCO_WB:
+ rate_str = "KHZ_16";
+ break;
+ case SND_DEVICE_IN_BT_SCO_MIC_WB_NREC:
+ case SND_DEVICE_IN_BT_SCO_MIC_WB:
+ rate_str = "KHZ_16";
+ is_rx_dev = false;
+ break;
+ default:
+ return 0;
+ }
+
+ ctl = (ctl_sr == NULL) ? (is_rx_dev ? ctl_sr_rx : ctl_sr_tx) : ctl_sr;
+ if (mixer_ctl_set_enum_by_string(ctl, rate_str) != 0)
+ return -ENOSYS;
+ }
+ return 0;
+}
+
int out_standby_l(struct audio_stream *stream);
struct stream_in *adev_get_active_input(const struct audio_device *adev)
@@ -2430,11 +2479,18 @@
ALOGE("%s: stream.out is NULL", __func__);
return -EINVAL;
}
- out_snd_device = platform_get_output_snd_device(adev->platform,
- usecase->stream.out);
- in_snd_device = platform_get_input_snd_device(adev->platform,
- NULL,
- usecase->stream.out->devices);
+ if (usecase->devices & AUDIO_DEVICE_OUT_BUS) {
+ out_snd_device = audio_extn_auto_hal_get_output_snd_device(adev,
+ uc_id);
+ in_snd_device = audio_extn_auto_hal_get_input_snd_device(adev,
+ uc_id);
+ } else {
+ out_snd_device = platform_get_output_snd_device(adev->platform,
+ usecase->stream.out);
+ in_snd_device = platform_get_input_snd_device(adev->platform,
+ NULL,
+ usecase->stream.out->devices);
+ }
usecase->devices = usecase->stream.out->devices;
} else if (usecase->type == TRANSCODE_LOOPBACK_RX) {
if (usecase->stream.inout == NULL) {
@@ -2515,8 +2571,11 @@
if (out_snd_device == SND_DEVICE_NONE) {
struct stream_out *voip_out = adev->primary_output;
struct stream_in *voip_in = get_voice_communication_input(adev);
- out_snd_device = platform_get_output_snd_device(adev->platform,
- usecase->stream.out);
+ if (usecase->devices & AUDIO_DEVICE_OUT_BUS)
+ out_snd_device = audio_extn_auto_hal_get_output_snd_device(adev, uc_id);
+ else
+ out_snd_device = platform_get_output_snd_device(adev->platform,
+ usecase->stream.out);
voip_usecase = get_usecase_from_list(adev, USECASE_AUDIO_PLAYBACK_VOIP);
if (voip_usecase)
@@ -2578,10 +2637,11 @@
return 0;
}
- if ((is_btsco_device(out_snd_device,in_snd_device) && !adev->bt_sco_on) ||
- (is_a2dp_device(out_snd_device) && !audio_extn_a2dp_source_is_ready())) {
- ALOGD("SCO/A2DP is selected but they are not connected/ready hence dont route");
- return 0;
+ if (!(usecase->devices & AUDIO_DEVICE_OUT_BUS) &&
+ ((is_btsco_device(out_snd_device,in_snd_device) && !adev->bt_sco_on) ||
+ (is_a2dp_device(out_snd_device) && !audio_extn_a2dp_source_is_ready()))) {
+ ALOGD("SCO/A2DP is selected but they are not connected/ready hence dont route");
+ return 0;
}
if (out_snd_device != SND_DEVICE_NONE &&
@@ -5872,25 +5932,24 @@
size_t kernel_buffer_size = out->config.period_size * out->config.period_count;
uint64_t signed_frames = 0;
+ uint64_t frames_temp = 0;
- if (avail > kernel_buffer_size)
- avail = kernel_buffer_size;
-
- if (out->written >= (kernel_buffer_size - avail))
- signed_frames = out->written - kernel_buffer_size + avail;
+ frames_temp = (kernel_buffer_size > avail) ? (kernel_buffer_size - avail) : 0;
+ if (out->written >= frames_temp)
+ signed_frames = out->written - frames_temp;
// This adjustment accounts for buffering after app processor.
// It is based on estimated DSP latency per use case, rather than exact.
- if (signed_frames >= (platform_render_latency(out->usecase) * out->sample_rate / 1000000LL))
- signed_frames -=
- (platform_render_latency(out->usecase) * out->sample_rate / 1000000LL);
+ frames_temp = platform_render_latency(out->usecase) * out->sample_rate / 1000000LL;
+ if (signed_frames >= frames_temp)
+ signed_frames -= frames_temp;
// Adjustment accounts for A2dp encoder latency with non offload usecases
// Note: Encoder latency is returned in ms, while platform_render_latency in us.
if (AUDIO_DEVICE_OUT_ALL_A2DP & out->devices) {
- if (signed_frames >= (audio_extn_a2dp_get_encoder_latency() * out->sample_rate / 1000))
- signed_frames -=
- (audio_extn_a2dp_get_encoder_latency() * out->sample_rate / 1000);
+ frames_temp = audio_extn_a2dp_get_encoder_latency() * out->sample_rate / 1000;
+ if (signed_frames >= frames_temp)
+ signed_frames -= frames_temp;
}
// It would be unusual for this value to be negative, but check just in case ...
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index b1e61ad..5e9627b 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -159,6 +159,8 @@
/* HFP Use case*/
USECASE_AUDIO_HFP_SCO,
USECASE_AUDIO_HFP_SCO_WB,
+ USECASE_AUDIO_HFP_SCO_DOWNLINK,
+ USECASE_AUDIO_HFP_SCO_WB_DOWNLINK,
/* Capture usecases */
USECASE_AUDIO_RECORD,
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 3383c4f..8814bc7 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -417,6 +417,8 @@
[USECASE_AUDIO_PLAYBACK_FM] = {FM_PLAYBACK_PCM_DEVICE, FM_CAPTURE_PCM_DEVICE},
[USECASE_AUDIO_HFP_SCO] = {HFP_PCM_RX, HFP_SCO_RX},
[USECASE_AUDIO_HFP_SCO_WB] = {HFP_PCM_RX, HFP_SCO_RX},
+ [USECASE_AUDIO_HFP_SCO_DOWNLINK] = {HFP_ASM_RX_TX, HFP_ASM_RX_TX},
+ [USECASE_AUDIO_HFP_SCO_WB_DOWNLINK] = {HFP_ASM_RX_TX, HFP_ASM_RX_TX},
[USECASE_VOICE_CALL] = {VOICE_CALL_PCM_DEVICE, VOICE_CALL_PCM_DEVICE},
[USECASE_AUDIO_PLAYBACK_MMAP] = {MMAP_PLAYBACK_PCM_DEVICE,
MMAP_PLAYBACK_PCM_DEVICE},
@@ -1276,6 +1278,8 @@
{TO_NAME_INDEX(USECASE_INCALL_REC_UPLINK_AND_DOWNLINK)},
{TO_NAME_INDEX(USECASE_AUDIO_HFP_SCO)},
{TO_NAME_INDEX(USECASE_AUDIO_HFP_SCO_WB)},
+ {TO_NAME_INDEX(USECASE_AUDIO_HFP_SCO_DOWNLINK)},
+ {TO_NAME_INDEX(USECASE_AUDIO_HFP_SCO_WB_DOWNLINK)},
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_FM)},
{TO_NAME_INDEX(USECASE_AUDIO_RECORD_FM_VIRTUAL)},
{TO_NAME_INDEX(USECASE_AUDIO_SPKR_CALIB_RX)},
@@ -4986,10 +4990,14 @@
snd_device_t incall_rec_device;
int sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
struct audio_backend_cfg backend_cfg = {0};
+ bool is_bus_dev_usecase = false;
if (voice_is_in_call(my_data->adev))
is_incall_rec_usecase = voice_is_in_call_rec_stream(usecase->stream.in);
+ if (usecase->devices & AUDIO_DEVICE_OUT_BUS)
+ is_bus_dev_usecase = true;
+
if (usecase->type == PCM_PLAYBACK)
snd_device = usecase->out_snd_device;
else if ((usecase->type == PCM_CAPTURE) && is_incall_rec_usecase)
@@ -5018,6 +5026,11 @@
new_snd_device[0] = snd_device;
}
}
+ if ((usecase->type == PCM_HFP_CALL) && is_bus_dev_usecase) {
+ num_devices = 2;
+ new_snd_device[0] = usecase->in_snd_device;
+ new_snd_device[1] = usecase->out_snd_device;
+ }
for (i = 0; i < num_devices; i++) {
if (!is_incall_rec_usecase) {
@@ -5037,6 +5050,17 @@
if ((usecase->type == PCM_CAPTURE) && (app_type == DEFAULT_APP_TYPE_RX_PATH)) {
ALOGD("Resetting app type for Tx path to default");
app_type = DEFAULT_APP_TYPE_TX_PATH;
+ } else if ((usecase->type == PCM_HFP_CALL) && is_bus_dev_usecase) {
+ if (new_snd_device[i] >= SND_DEVICE_OUT_BEGIN &&
+ new_snd_device[i] < SND_DEVICE_OUT_END) {
+ app_type = usecase->out_app_type_cfg.app_type;
+ sample_rate = usecase->out_app_type_cfg.sample_rate;
+ } else {
+ app_type = usecase->in_app_type_cfg.app_type;
+ sample_rate = usecase->in_app_type_cfg.sample_rate;
+ }
+ ALOGD("%s: Updating to app type (%d) and sample rate (%d)",
+ __func__, app_type, sample_rate);
}
/* Override backend cfg sample rate in calibration for vi feedback usecase */
@@ -6078,8 +6102,7 @@
snd_device = SND_DEVICE_OUT_BT_SCO_WB;
else
snd_device = SND_DEVICE_OUT_BT_SCO;
- } else if ((devices & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE)) ||
- (devices & AUDIO_DEVICE_OUT_BUS)) {
+ } else if (devices & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
if (my_data->is_vbat_speaker || my_data->is_bcl_speaker) {
if (hw_info_is_stereo_spkr(my_data->hw_info)) {
if (my_data->mono_speaker == SPKR_1)
@@ -6255,7 +6278,7 @@
snd_device = SND_DEVICE_OUT_AFE_PROXY;
audio_extn_set_afe_proxy_channel_mixer(adev, channel_count, snd_device);
} else if (devices & AUDIO_DEVICE_OUT_BUS) {
- snd_device = audio_extn_auto_hal_get_snd_device_for_car_audio_stream(out);
+ snd_device = audio_extn_auto_hal_get_output_snd_device(adev, out->usecase);
} else {
ALOGE("%s: Unknown device(s) %#x", __func__, devices);
}
@@ -6634,8 +6657,7 @@
} else if (out_device & AUDIO_DEVICE_OUT_SPEAKER ||
out_device & AUDIO_DEVICE_OUT_SPEAKER_SAFE ||
out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
- out_device & AUDIO_DEVICE_OUT_LINE ||
- out_device & AUDIO_DEVICE_OUT_BUS) {
+ out_device & AUDIO_DEVICE_OUT_LINE) {
if (my_data->fluence_type != FLUENCE_NONE &&
(my_data->fluence_in_voice_call ||
my_data->fluence_in_hfp_call) &&
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 2a570ce..7f54e7f 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -451,7 +451,7 @@
#define FM_CAPTURE_PCM_DEVICE 6
#ifdef PLATFORM_AUTO
-#define HFP_PCM_RX 36
+#define HFP_PCM_RX 29
#else
#define HFP_PCM_RX 5
#endif
@@ -638,8 +638,8 @@
#define HFP_SCO_RX 17
#define HFP_ASM_RX_TX 18
#elif PLATFORM_AUTO
-#define HFP_SCO_RX 36
-#define HFP_ASM_RX_TX 29
+#define HFP_SCO_RX 29
+#define HFP_ASM_RX_TX 36
#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937)
#define HFP_SCO_RX 17
#define HFP_ASM_RX_TX 18
diff --git a/qahw/Android.mk b/qahw/Android.mk
index a64b913..84645b8 100644
--- a/qahw/Android.mk
+++ b/qahw/Android.mk
@@ -11,6 +11,10 @@
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(libqahw-inc)
+LOCAL_HEADER_LIBRARIES := libutils_headers \
+ libsystem_headers \
+ libhardware_headers
+
LOCAL_SRC_FILES := \
src/qahw.c \
src/qahw_effect.c
@@ -27,15 +31,10 @@
LOCAL_COPY_HEADERS := inc/qahw.h
LOCAL_COPY_HEADERS += inc/qahw_effect_api.h
-LOCAL_PRELINK_MODULE := false
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_COPY_HEADERS_TO := mm-audio/qahw_api/inc
-LOCAL_COPY_HEADERS := inc/qahw_defs.h
-
-include $(BUILD_COPY_HEADERS)
endif
endif
diff --git a/qahw/src/qahw.c b/qahw/src/qahw.c
index 545152c..ceec657 100644
--- a/qahw/src/qahw.c
+++ b/qahw/src/qahw.c
@@ -35,7 +35,7 @@
#include <utils/Log.h>
#include <stdlib.h>
#include <cutils/list.h>
-
+#include <pthread.h>
#include <hardware/audio.h>
#include <hardware/sound_trigger.h>
#include "qahw.h"
diff --git a/qahw/src/qahw_effect.c b/qahw/src/qahw_effect.c
index 9bee2a1..ff92f73 100644
--- a/qahw/src/qahw_effect.c
+++ b/qahw/src/qahw_effect.c
@@ -37,7 +37,7 @@
#include <hardware/audio.h>
#include <hardware/audio_effect.h>
#include <stdlib.h>
-
+#include <pthread.h>
#include "qahw.h"
// The current effect API version.
diff --git a/qahw_api/Android.mk b/qahw_api/Android.mk
index 1cad75d..a873a7d 100644
--- a/qahw_api/Android.mk
+++ b/qahw_api/Android.mk
@@ -25,12 +25,14 @@
libcutils \
libhardware \
libdl \
+ libutils \
libqahwwrapper
LOCAL_CFLAGS += -Wall -Werror
LOCAL_COPY_HEADERS_TO := mm-audio/qahw_api/inc
-LOCAL_COPY_HEADERS := inc/qahw_api.h
+LOCAL_COPY_HEADERS := inc/qahw_defs.h
+LOCAL_COPY_HEADERS += inc/qahw_api.h
LOCAL_COPY_HEADERS += inc/qahw_effect_audiosphere.h
LOCAL_COPY_HEADERS += inc/qahw_effect_bassboost.h
LOCAL_COPY_HEADERS += inc/qahw_effect_environmentalreverb.h
@@ -39,7 +41,6 @@
LOCAL_COPY_HEADERS += inc/qahw_effect_virtualizer.h
LOCAL_COPY_HEADERS += inc/qahw_effect_visualizer.h
-LOCAL_PRELINK_MODULE := false
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)