Merge "post_proc: fix mul-overflow"
diff --git a/configs/atoll/audio_platform_info_intcodec.xml b/configs/atoll/audio_platform_info_intcodec.xml
index e72a83a..b479cfc 100644
--- a/configs/atoll/audio_platform_info_intcodec.xml
+++ b/configs/atoll/audio_platform_info_intcodec.xml
@@ -75,6 +75,7 @@
<param key="spkr_1_tz_name" value="wsatz.13"/>
<param key="spkr_2_tz_name" value="wsatz.14"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="multiple_mix_dsp"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="4"/>
@@ -105,6 +106,7 @@
</acdb_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -112,6 +114,7 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
diff --git a/configs/atoll/audio_platform_info_qrd.xml b/configs/atoll/audio_platform_info_qrd.xml
index f272aee..a47a3ac 100644
--- a/configs/atoll/audio_platform_info_qrd.xml
+++ b/configs/atoll/audio_platform_info_qrd.xml
@@ -73,6 +73,7 @@
<param key="mono_speaker" value="left"/>
<param key="spkr_2_tz_name" value="wsatz.13"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="multiple_mix_dsp"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="2"/>
@@ -103,6 +104,7 @@
</acdb_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -110,6 +112,7 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
diff --git a/configs/atoll/mixer_paths.xml b/configs/atoll/mixer_paths.xml
index d04fc1e..9d7487f 100644
--- a/configs/atoll/mixer_paths.xml
+++ b/configs/atoll/mixer_paths.xml
@@ -2763,6 +2763,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
</path>
@@ -2852,6 +2856,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/atoll/mixer_paths_qrd.xml b/configs/atoll/mixer_paths_qrd.xml
index 7bd3a90..7ace581 100644
--- a/configs/atoll/mixer_paths_qrd.xml
+++ b/configs/atoll/mixer_paths_qrd.xml
@@ -3009,6 +3009,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
<ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />
<ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
@@ -3075,6 +3079,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/atoll/mixer_paths_wcd937x.xml b/configs/atoll/mixer_paths_wcd937x.xml
index 44a5161..4195193 100644
--- a/configs/atoll/mixer_paths_wcd937x.xml
+++ b/configs/atoll/mixer_paths_wcd937x.xml
@@ -2764,6 +2764,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
</path>
@@ -2853,6 +2857,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/kona/audio_platform_info_intcodec.xml b/configs/kona/audio_platform_info_intcodec.xml
index 4c0c9c3..d1c45b9 100644
--- a/configs/kona/audio_platform_info_intcodec.xml
+++ b/configs/kona/audio_platform_info_intcodec.xml
@@ -103,6 +103,7 @@
<param key="spkr_1_tz_name" value="wsatz.13"/>
<param key="spkr_2_tz_name" value="wsatz.14"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="multiple_mix_dsp"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="4"/>
@@ -140,6 +141,7 @@
</acdb_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -147,6 +149,7 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
diff --git a/configs/kona/audio_platform_info_qrd.xml b/configs/kona/audio_platform_info_qrd.xml
index bd5ebdc..a8f765a 100644
--- a/configs/kona/audio_platform_info_qrd.xml
+++ b/configs/kona/audio_platform_info_qrd.xml
@@ -100,6 +100,7 @@
<param key="mono_speaker" value="right"/>
<param key="spkr_2_tz_name" value="wsatz.14"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="multiple_mix_dsp"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="4"/>
@@ -151,6 +152,7 @@
</module_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -158,6 +160,7 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
diff --git a/configs/kona/mixer_paths.xml b/configs/kona/mixer_paths.xml
index 0178dfc..bbbe8e2 100644
--- a/configs/kona/mixer_paths.xml
+++ b/configs/kona/mixer_paths.xml
@@ -2497,6 +2497,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
</path>
@@ -2586,6 +2590,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/kona/mixer_paths_cdp.xml b/configs/kona/mixer_paths_cdp.xml
index daac27a..8df2b66 100644
--- a/configs/kona/mixer_paths_cdp.xml
+++ b/configs/kona/mixer_paths_cdp.xml
@@ -2371,6 +2371,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
</path>
@@ -2460,6 +2464,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/kona/mixer_paths_qrd.xml b/configs/kona/mixer_paths_qrd.xml
index a8a90b4..229c46d 100644
--- a/configs/kona/mixer_paths_qrd.xml
+++ b/configs/kona/mixer_paths_qrd.xml
@@ -2797,6 +2797,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
<ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />
<ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
@@ -2864,6 +2868,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/kona/sound_trigger_mixer_paths.xml b/configs/kona/sound_trigger_mixer_paths.xml
index 8cb6622..385bed9 100644
--- a/configs/kona/sound_trigger_mixer_paths.xml
+++ b/configs/kona/sound_trigger_mixer_paths.xml
@@ -81,6 +81,7 @@
<ctl name="EC Reference Channels" value="Zero"/>
<ctl name="EC Reference Bit Format" value="0"/>
<ctl name="EC Reference SampleRate" value="0"/>
+ <ctl name="ADC2_MIXER Switch" value="0" />
<path name="listen-voice-wakeup-1">
<ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
diff --git a/configs/kona/sound_trigger_mixer_paths_qrd.xml b/configs/kona/sound_trigger_mixer_paths_qrd.xml
index a8180e4..9a51ec6 100644
--- a/configs/kona/sound_trigger_mixer_paths_qrd.xml
+++ b/configs/kona/sound_trigger_mixer_paths_qrd.xml
@@ -81,6 +81,7 @@
<ctl name="EC Reference Channels" value="Zero"/>
<ctl name="EC Reference Bit Format" value="0"/>
<ctl name="EC Reference SampleRate" value="0"/>
+ <ctl name="ADC2_MIXER Switch" value="0" />
<path name="listen-voice-wakeup-1">
<ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
diff --git a/configs/kona/sound_trigger_platform_info.xml b/configs/kona/sound_trigger_platform_info.xml
index 17a937c..479d7dc 100644
--- a/configs/kona/sound_trigger_platform_info.xml
+++ b/configs/kona/sound_trigger_platform_info.xml
@@ -269,14 +269,45 @@
<!-- is FFECNS -->
<param fluence_type="NONE" />
<param execution_mode="ADSP" />
+ <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->
+ <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->
+ <!-- must be present with this mode type to handle barge-in. -->
+ <!-- NON_LPI: If another lsm_usecase is present with this mode -->
+ <!-- type, it will be used for non-LPI non-barge-in usecases. -->
+ <!-- If not present, NON_LPI_BARGE_IN mode type will be used. -->
+ <!-- LPI: This mode type will be used for LPI usecases. -->
+ <param lpi_mode="NON_LPI_BARGE_IN" />
<param app_type="3" /> <!-- app type used in ACDB -->
<param in_channels="1"/> <!-- Module input channels -->
<param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
<param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
- <param confidence_levels_ids="0x18000001, 0x0, 0x00012C07" />
- <param operation_mode_ids="0x18000001, 0x0, 0x00012C02" />
- <param polling_enable_ids="0x18000001, 0x0, 0x00012C1B" />
<param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
+ <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
+ </lsm_usecase>
+ <lsm_usecase>
+ <param capture_device="HANDSET" />
+ <!-- adm_cfg_profile should match with the one defined under adm_config -->
+ <!-- Set it to NONE if LSM directly connects to AFE -->
+ <param adm_cfg_profile="NONE" />
+ <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
+ <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
+ <!-- is FFECNS -->
+ <param fluence_type="NONE" />
+ <param execution_mode="ADSP" />
+ <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->
+ <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->
+ <!-- must be present with this mode type to handle barge-in. -->
+ <!-- NON_LPI: If another lsm_usecase is present with this mode -->
+ <!-- type, it will be used for non-LPI non-barge-in usecases. -->
+ <!-- If not present, NON_LPI_BARGE_IN mode type will be used. -->
+ <!-- LPI: This mode type will be used for LPI usecases. -->
+ <param lpi_mode="LPI" />
+ <param app_type="3" /> <!-- app type used in ACDB -->
+ <param in_channels="1"/> <!-- Module input channels -->
+ <param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
+ <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
+ <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
+ <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
</lsm_usecase>
<lsm_usecase>
<param capture_device="HEADSET" />
@@ -287,10 +318,8 @@
<param in_channels="1"/> <!-- Module input channels -->
<param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
<param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
- <param confidence_levels_ids="0x18000001, 0x0, 0x00012C07" />
- <param operation_mode_ids="0x18000001, 0x0, 0x00012C02" />
- <param polling_enable_ids="0x18000001, 0x0, 0x00012C1B" />
<param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
+ <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
</lsm_usecase>
<!-- format: "ADPCM_packet" or "PCM_packet" !-->
diff --git a/configs/lito/audio_platform_info_qrd.xml b/configs/lito/audio_platform_info_qrd.xml
index ec51297..7bd014f 100644
--- a/configs/lito/audio_platform_info_qrd.xml
+++ b/configs/lito/audio_platform_info_qrd.xml
@@ -74,6 +74,7 @@
<param key="mono_speaker" value="right"/>
<param key="spkr_2_tz_name" value="wsatz.14"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="multiple_mix_dsp"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="4"/>
@@ -104,6 +105,7 @@
</acdb_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -111,6 +113,7 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
diff --git a/configs/lito/mixer_paths_cdp.xml b/configs/lito/mixer_paths_cdp.xml
index 5ef35f0..0b2b992 100644
--- a/configs/lito/mixer_paths_cdp.xml
+++ b/configs/lito/mixer_paths_cdp.xml
@@ -2795,6 +2795,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
</path>
@@ -2889,6 +2893,11 @@
<path name="speaker-safe" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-and-line">
<path name="speaker-and-headphones" />
</path>
diff --git a/configs/lito/mixer_paths_qrd.xml b/configs/lito/mixer_paths_qrd.xml
index 4bf2ff2..a7149ca 100644
--- a/configs/lito/mixer_paths_qrd.xml
+++ b/configs/lito/mixer_paths_qrd.xml
@@ -3024,6 +3024,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
<ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />
<ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
@@ -3091,6 +3095,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index eba94f0..18b2bf6 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -272,7 +272,7 @@
vendor.audio.feature.compr_cap.enable=false \
vendor.audio.feature.compress_in.enable=false \
vendor.audio.feature.compress_meta_data.enable=true \
-vendor.audio.feature.compr_voip.enable=false \
+vendor.audio.feature.compr_voip.enable=true \
vendor.audio.feature.concurrent_capture.enable=false \
vendor.audio.feature.custom_stereo.enable=true \
vendor.audio.feature.display_port.enable=true \
diff --git a/configs/msmnile_au/audio_platform_info.xml b/configs/msmnile_au/audio_platform_info.xml
index 4fdf786..f39a804 100644
--- a/configs/msmnile_au/audio_platform_info.xml
+++ b/configs/msmnile_au/audio_platform_info.xml
@@ -49,6 +49,7 @@
<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_VOICE_SPEAKER_MIC_HFP_MMSECNS" acdb_id="131"/>
<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"/>
@@ -74,6 +75,10 @@
<device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
<device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
</ns>
+ <mmsecns>
+ <!-- multi-mic surround ECNS zone control -->
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" topology_id="0x1FFF0002" module_id="0x10F3B" instance_id="0x8000" param_id="0x109F0"/>
+ </mmsecns>
</module_ids>
<bit_width_configs>
@@ -174,6 +179,8 @@
<device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_HANDSET_QMIC" interface="TERT_TDM_TX_0"/>
+ <!-- multi-mic surround ECNS mixer path definition -->
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" backend="bt-sco-mmsecns" interface="TERT_TDM_TX_0"/>
</backend_names>
<!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
<microphone_characteristics>
diff --git a/configs/msmnile_au/mixer_paths_adp.xml b/configs/msmnile_au/mixer_paths_adp.xml
index 566f1e9..6d1e667 100644
--- a/configs/msmnile_au/mixer_paths_adp.xml
+++ b/configs/msmnile_au/mixer_paths_adp.xml
@@ -1600,12 +1600,6 @@
<path name="incall-rec-uplink-and-downlink-compress" />
</path>
- <path name="hfp-sco">
- <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" />
- </path>
-
<path name="icc-call">
<ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
@@ -1624,11 +1618,26 @@
<path name="hfp-sco headphones">
</path>
+ <path name="hfp-sco-wb headphones">
+ <path name="hfp-sco headphones" />
+ </path>
+
<path name="hfp-sco headset">
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco">
+ <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
+ </path>
+
<path name="hfp-sco bt-sco">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
+ <path name="hfp-sco" />
+ </path>
+
+ <path name="hfp-sco bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<path name="hfp-sco" />
</path>
@@ -1638,11 +1647,13 @@
</path>
<path name="hfp-sco-wb bt-sco-wb">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
<path name="hfp-sco-wb" />
</path>
- <path name="hfp-sco-wb headphones">
- <path name="hfp-sco headphones" />
+ <path name="hfp-sco-wb bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <path name="hfp-sco-wb" />
</path>
@@ -2145,6 +2156,10 @@
<path name="speaker-mic" />
</path>
+ <path name="voice-speaker-mic-hfp-mmsecns">
+ <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 2136c79..28a0224 100644
--- a/configs/msmnile_au/mixer_paths_custom.xml
+++ b/configs/msmnile_au/mixer_paths_custom.xml
@@ -1588,12 +1588,6 @@
<path name="incall-rec-uplink-and-downlink-compress" />
</path>
- <path name="hfp-sco">
- <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" />
- </path>
-
<path name="icc-call">
<ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
@@ -1612,11 +1606,26 @@
<path name="hfp-sco headphones">
</path>
+ <path name="hfp-sco-wb headphones">
+ <path name="hfp-sco headphones" />
+ </path>
+
<path name="hfp-sco headset">
<path name="hfp-sco headphones" />
</path>
+ <path name="hfp-sco">
+ <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
+ </path>
+
<path name="hfp-sco bt-sco">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
+ <path name="hfp-sco" />
+ </path>
+
+ <path name="hfp-sco bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<path name="hfp-sco" />
</path>
@@ -1626,11 +1635,13 @@
</path>
<path name="hfp-sco-wb bt-sco-wb">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
<path name="hfp-sco-wb" />
</path>
- <path name="hfp-sco-wb headphones">
- <path name="hfp-sco headphones" />
+ <path name="hfp-sco-wb bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <path name="hfp-sco-wb" />
</path>
@@ -2133,6 +2144,10 @@
<path name="speaker-mic" />
</path>
+ <path name="voice-speaker-mic-hfp-mmsecns">
+ <path name="speaker-mic" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
</path>
diff --git a/configs/msmsteppe/audio_platform_info_intcodec.xml b/configs/msmsteppe/audio_platform_info_intcodec.xml
index 6273fb8..94ea850 100644
--- a/configs/msmsteppe/audio_platform_info_intcodec.xml
+++ b/configs/msmsteppe/audio_platform_info_intcodec.xml
@@ -73,6 +73,7 @@
<param key="spkr_1_tz_name" value="wsatz.13"/>
<param key="spkr_2_tz_name" value="wsatz.14"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="true"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="4"/>
@@ -108,6 +109,7 @@
</acdb_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -115,6 +117,7 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
diff --git a/configs/msmsteppe/audio_platform_info_qrd.xml b/configs/msmsteppe/audio_platform_info_qrd.xml
index c49fcb5..1070291 100644
--- a/configs/msmsteppe/audio_platform_info_qrd.xml
+++ b/configs/msmsteppe/audio_platform_info_qrd.xml
@@ -72,6 +72,7 @@
<param key="mono_speaker" value="right"/>
<param key="spkr_1_tz_name" value="wsatz.11"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="true"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="2"/>
@@ -103,6 +104,7 @@
</acdb_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -110,6 +112,7 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
diff --git a/configs/msmsteppe/mixer_paths_idp.xml b/configs/msmsteppe/mixer_paths_idp.xml
index 0ae0e65..143b0b7 100644
--- a/configs/msmsteppe/mixer_paths_idp.xml
+++ b/configs/msmsteppe/mixer_paths_idp.xml
@@ -2565,6 +2565,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
</path>
@@ -2639,6 +2643,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/msmsteppe/mixer_paths_qrd.xml b/configs/msmsteppe/mixer_paths_qrd.xml
index 2cd498d..32e8e4b 100644
--- a/configs/msmsteppe/mixer_paths_qrd.xml
+++ b/configs/msmsteppe/mixer_paths_qrd.xml
@@ -2586,6 +2586,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
</path>
@@ -2652,6 +2656,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/msmsteppe/mixer_paths_wcd9375.xml b/configs/msmsteppe/mixer_paths_wcd9375.xml
index 9a1288f..89f6191 100644
--- a/configs/msmsteppe/mixer_paths_wcd9375.xml
+++ b/configs/msmsteppe/mixer_paths_wcd9375.xml
@@ -2578,6 +2578,10 @@
<path name="headphones" />
</path>
+ <path name="headphones-hifi-filter">
+ <path name="headphones" />
+ </path>
+
<path name="hph-highquality-mode">
<ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />
<ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
@@ -2656,6 +2660,11 @@
<path name="speaker" />
</path>
+ <path name="speaker-and-headphones-hifi-filter">
+ <path name="headphones" />
+ <path name="speaker-safe" />
+ </path>
+
<path name="speaker-safe-and-headphones">
<path name="headphones" />
<path name="speaker-safe" />
diff --git a/configs/msmsteppe_au/audio_platform_info.xml b/configs/msmsteppe_au/audio_platform_info.xml
index 4fdf786..f39a804 100644
--- a/configs/msmsteppe_au/audio_platform_info.xml
+++ b/configs/msmsteppe_au/audio_platform_info.xml
@@ -49,6 +49,7 @@
<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_VOICE_SPEAKER_MIC_HFP_MMSECNS" acdb_id="131"/>
<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"/>
@@ -74,6 +75,10 @@
<device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
<device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
</ns>
+ <mmsecns>
+ <!-- multi-mic surround ECNS zone control -->
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" topology_id="0x1FFF0002" module_id="0x10F3B" instance_id="0x8000" param_id="0x109F0"/>
+ </mmsecns>
</module_ids>
<bit_width_configs>
@@ -174,6 +179,8 @@
<device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>
<device name="SND_DEVICE_IN_HANDSET_QMIC" interface="TERT_TDM_TX_0"/>
+ <!-- multi-mic surround ECNS mixer path definition -->
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" backend="bt-sco-mmsecns" interface="TERT_TDM_TX_0"/>
</backend_names>
<!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
<microphone_characteristics>
diff --git a/configs/msmsteppe_au/mixer_paths_adp.xml b/configs/msmsteppe_au/mixer_paths_adp.xml
index 7622dd8..71eb87e 100644
--- a/configs/msmsteppe_au/mixer_paths_adp.xml
+++ b/configs/msmsteppe_au/mixer_paths_adp.xml
@@ -1371,12 +1371,6 @@
<path name="incall-rec-uplink-and-downlink-compress" />
</path>
- <path name="hfp-sco">
- <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" />
- </path>
-
<path name="icc-call">
<ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
@@ -1395,7 +1389,22 @@
<path name="hfp-sco headphones">
</path>
+ <path name="hfp-sco-wb headphones">
+ <path name="hfp-sco headphones" />
+ </path>
+
+ <path name="hfp-sco">
+ <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
+ </path>
+
<path name="hfp-sco bt-sco">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
+ <path name="hfp-sco" />
+ </path>
+
+ <path name="hfp-sco bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<path name="hfp-sco" />
</path>
@@ -1405,11 +1414,13 @@
</path>
<path name="hfp-sco-wb bt-sco-wb">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
<path name="hfp-sco-wb" />
</path>
- <path name="hfp-sco-wb headphones">
- <path name="hfp-sco headphones" />
+ <path name="hfp-sco-wb bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <path name="hfp-sco-wb" />
</path>
<path name="hfp-sco-downlink">
@@ -1870,6 +1881,10 @@
<path name="speaker-mic" />
</path>
+ <path name="voice-speaker-mic-hfp-mmsecns">
+ <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 dd0da54..fdfb282 100644
--- a/configs/msmsteppe_au/mixer_paths_custom.xml
+++ b/configs/msmsteppe_au/mixer_paths_custom.xml
@@ -1360,12 +1360,6 @@
<path name="incall-rec-uplink-and-downlink-compress" />
</path>
- <path name="hfp-sco">
- <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" />
- </path>
-
<path name="icc-call">
<ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
@@ -1384,7 +1378,22 @@
<path name="hfp-sco headphones">
</path>
+ <path name="hfp-sco-wb headphones">
+ <path name="hfp-sco headphones" />
+ </path>
+
+ <path name="hfp-sco">
+ <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
+ </path>
+
<path name="hfp-sco bt-sco">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
+ <path name="hfp-sco" />
+ </path>
+
+ <path name="hfp-sco bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<path name="hfp-sco" />
</path>
@@ -1394,11 +1403,13 @@
</path>
<path name="hfp-sco-wb bt-sco-wb">
+ <ctl name="TERT_TDM_TX_0 Channels" value="One" />
<path name="hfp-sco-wb" />
</path>
- <path name="hfp-sco-wb headphones">
- <path name="hfp-sco headphones" />
+ <path name="hfp-sco-wb bt-sco-mmsecns">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <path name="hfp-sco-wb" />
</path>
<path name="hfp-sco-downlink">
@@ -1859,6 +1870,10 @@
<path name="speaker-mic" />
</path>
+ <path name="voice-speaker-mic-hfp-mmsecns">
+ <path name="speaker-mic" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
</path>
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a27abcb..89228ec 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -8399,21 +8399,6 @@
adev->allow_afe_proxy_usage = true;
}
}
- if (audio_is_a2dp_out_device(device)) {
- struct audio_usecase *usecase;
- struct listnode *node;
- list_for_each(node, &adev->usecase_list) {
- usecase = node_to_item(node, struct audio_usecase, list);
- if (PCM_PLAYBACK == usecase->type && usecase->stream.out &&
- (usecase->stream.out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) &&
- usecase->stream.out->a2dp_compress_mute) {
- struct stream_out *out = usecase->stream.out;
- ALOGD("Unmuting the stream when Bt-A2dp disconnected and stream is mute");
- out->a2dp_compress_mute = false;
- out_set_compr_volume(&out->stream, out->volume_l, out->volume_r);
- }
- }
- }
}
audio_extn_hfp_set_parameters(adev, parms);
diff --git a/qahw_api/src/qahw_api.cpp b/qahw_api/src/qahw_api.cpp
index cbde5e3..07d2678 100644
--- a/qahw_api/src/qahw_api.cpp
+++ b/qahw_api/src/qahw_api.cpp
@@ -1668,8 +1668,10 @@
int qahw_init_check(const qahw_module_handle_t *hw_module)
{
- ALOGV("%d:%s",__LINE__, __func__);
- return qahw_init_check_l(hw_module);
+ ALOGV("%d:%s start",__LINE__, __func__);
+ int rc = qahw_init_check_l(hw_module);
+ ALOGV("%d:%s end",__LINE__, __func__);
+ return rc;
}
int qahw_set_voice_volume(qahw_module_handle_t *hw_module, float volume)
@@ -1902,8 +1904,10 @@
qahw_module_handle_t *qahw_load_module(const char *hw_module_id)
{
- ALOGV("%d:%s",__LINE__, __func__);
- return qahw_load_module_l(hw_module_id);
+ ALOGV("%d:%s start",__LINE__, __func__);
+ qahw_module_handle_t *module = qahw_load_module_l(hw_module_id);
+ ALOGV("%d:%s end",__LINE__, __func__);
+ return module;
}
#if QAHW_V1
@@ -2012,6 +2016,7 @@
void *cookie,
qahw_stream_handle_t **stream_handle) {
+ ALOGV("%d:%s start",__LINE__, __func__);
audio_io_handle_t handle = 0x999;
int rc = -EINVAL;
const char *address = stream_name_map[attr.type];
@@ -2146,6 +2151,7 @@
if(no_of_modifiers){
ALOGE("%s: modifiers not currently supported\n", __func__);
}
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2154,6 +2160,7 @@
qahw_stream_direction dir;
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
+ ALOGV("%d:%s start",__LINE__, __func__);
if (stream) {
switch (stream->dir) {
case QAHW_STREAM_OUTPUT:
@@ -2183,6 +2190,7 @@
free(stream->vol.vol_pair);
free(stream);
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2191,6 +2199,7 @@
qahw_audio_stream_type type;
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
+ ALOGV("%d:%s start",__LINE__, __func__);
if (!stream) {
ALOGE("%d:%s invalid stream handle", __LINE__, __func__);
return rc;
@@ -2201,6 +2210,10 @@
}
qahw_stream_set_device(stream, stream->num_of_devices, stream->devices);
+ memset(&devices[0], 0, sizeof(devices));
+ memcpy(&devices[0], &stream->devices[0], stream->num_of_devices);
+ qahw_stream_set_device(stream, stream->num_of_devices, &devices[0]);
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2209,11 +2222,13 @@
qahw_audio_stream_type type;
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
+ ALOGV("%d:%s start",__LINE__, __func__);
/*reset call state and call mode for voice */
if (stream->type == QAHW_VOICE_CALL) {
rc = qahw_set_parameters(stream->hw_module, "call_state=1");
rc = qahw_set_mode(stream->hw_module, AUDIO_MODE_NORMAL);
}
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2226,6 +2241,7 @@
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
bool is_voice = false;
+ ALOGV("%d:%s start",__LINE__, __func__);
strlcpy(device_route, "routing=", QAHW_MAX_INT_STRING);
if (stream && num_of_devices && devices) {
@@ -2289,6 +2305,7 @@
memcpy(&stream->devices[0], devices, num_of_devices);
}
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2297,6 +2314,7 @@
int rc = 0;
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
+ ALOGV("%d:%s start",__LINE__, __func__);
if (stream && num_of_dev && devices) {
*num_of_dev = stream->num_of_devices;
*devices = stream->devices;
@@ -2305,6 +2323,7 @@
rc = -EINVAL;
}
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2319,6 +2338,7 @@
bool r_found = false;
int i;
+ ALOGV("%d:%s start",__LINE__, __func__);
if(stream) {
/*currently max 2 channels is supported */
if ( vol_data.num_of_channels > QAHW_CHANNELS_MAX) {
@@ -2366,6 +2386,7 @@
} else
ALOGE("%s: null stream handle\n", __func__);
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2373,11 +2394,13 @@
struct qahw_volume_data **vol_data) {
int rc = 0;
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
+ ALOGV("%d:%s start",__LINE__, __func__);
if (stream)
*vol_data = &stream->vol;
else
rc = -EINVAL;
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2404,6 +2427,7 @@
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
char *mute_param;
+ ALOGV("%d:%s start",__LINE__, __func__);
if(stream) {
mute_param = qahw_get_device_mute_info(mute_data);
@@ -2430,6 +2454,7 @@
}
}
}
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2438,6 +2463,7 @@
int rc = 0;
qahw_api_stream_t *stream = (qahw_api_stream_t *)stream_handle;
+ ALOGV("%d:%s start",__LINE__, __func__);
if(stream && mute_data){
switch(mute_data->direction) {
case QAHW_STREAM_OUTPUT:
@@ -2453,6 +2479,7 @@
}
}
+ ALOGV("%d:%s end",__LINE__, __func__);
return rc;
}
@@ -2610,15 +2637,18 @@
else
ALOGE("%d:%s out stream invalid, cannot flush"
, __LINE__, __func__);
+ break;
case QAHW_STREAM_INPUT:
ALOGE("%d:%s cannot flush input stream"
, __LINE__, __func__);
+ break;
case QAHW_STREAM_INPUT_OUTPUT:
if (stream->out_stream)
rc = qahw_out_flush(stream->out_stream);
else
ALOGE("%d:%s out stream invalid, cannot flush"
, __LINE__, __func__);
+ break;
}
} else
ALOGE("%d:%s invalid stream handle, flush failed"
@@ -2638,15 +2668,18 @@
else
ALOGE("%d:%s out stream invalid, cannot drain"
, __LINE__, __func__);
+ break;
case QAHW_STREAM_INPUT:
ALOGE("%d:%s cannot drain input stream"
, __LINE__, __func__);
+ break;
case QAHW_STREAM_INPUT_OUTPUT:
if (stream->out_stream)
rc = qahw_out_drain(stream->out_stream, type);
else
ALOGE("%d:%s out stream invalid, cannot drain"
, __LINE__, __func__);
+ break;
}
} else
ALOGE("%d:%s invalid stream handle, drain failed"
@@ -2668,6 +2701,7 @@
, __LINE__, __func__);
rc = -EINVAL;
}
+ break;
case QAHW_STREAM_INPUT:
if (stream->in_stream)
*in_buffer = qahw_in_get_buffer_size(stream->in_stream);
@@ -2676,6 +2710,7 @@
, __LINE__, __func__);
rc = -EINVAL;
}
+ break;
case QAHW_STREAM_INPUT_OUTPUT:
if (stream->out_stream)
*out_buffer = qahw_out_get_buffer_size(stream->out_stream);
@@ -2691,12 +2726,18 @@
, __LINE__, __func__);
rc = -EINVAL;
}
+ break;
+ default:
+ ALOGE("%d:%s invalid stream direction, cannot get size", __LINE__, __func__);
+ rc = -EINVAL;
+ break;
}
} else {
ALOGE("%d:%s invalid stream handle, get size failed failed"
, __LINE__, __func__);
rc = -EINVAL;
}
+ ALOGV("%d:%s inSz %d outSz %d ret 0x%8x", __LINE__, __func__, *in_buffer, *out_buffer, rc);
return rc;
}