diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2019-10-25 19:19:06 -0700 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2019-10-25 19:19:06 -0700 |
commit | 2483233a025e10b6b439a81fe8bfcaa183d08f69 (patch) | |
tree | 8bc7a4f76b8455d4a8f6d8058e5a4bf65998ef54 | |
parent | 45677963b49b1474652bef3a0a0b5ea9aa7a803e (diff) | |
parent | e9445319d959a829bca7aae71fe7a997ee5b4a74 (diff) | |
download | hardware_qcom_audio-2483233a025e10b6b439a81fe8bfcaa183d08f69.tar.gz hardware_qcom_audio-2483233a025e10b6b439a81fe8bfcaa183d08f69.tar.bz2 hardware_qcom_audio-2483233a025e10b6b439a81fe8bfcaa183d08f69.zip |
Merge e9445319d959a829bca7aae71fe7a997ee5b4a74 on remote branch
Change-Id: I486c5b37a7123d551646d61c0194453fbb99f5fc
-rw-r--r-- | configs/atoll/audio_platform_info_intcodec.xml | 3 | ||||
-rw-r--r-- | configs/atoll/audio_platform_info_qrd.xml | 3 | ||||
-rw-r--r-- | configs/atoll/mixer_paths.xml | 9 | ||||
-rw-r--r-- | configs/atoll/mixer_paths_qrd.xml | 9 | ||||
-rw-r--r-- | configs/atoll/mixer_paths_wcd937x.xml | 291 | ||||
-rw-r--r-- | configs/kona/audio_platform_info_intcodec.xml | 3 | ||||
-rw-r--r-- | configs/kona/audio_platform_info_qrd.xml | 3 | ||||
-rw-r--r-- | configs/kona/mixer_paths.xml | 9 | ||||
-rw-r--r-- | configs/kona/mixer_paths_cdp.xml | 9 | ||||
-rw-r--r-- | configs/kona/mixer_paths_qrd.xml | 9 | ||||
-rw-r--r-- | configs/lito/audio_platform_info_qrd.xml | 3 | ||||
-rw-r--r-- | configs/lito/mixer_paths_qrd.xml | 9 | ||||
-rw-r--r-- | configs/msm8998/msm8998.mk | 2 | ||||
-rw-r--r-- | configs/msmsteppe/audio_platform_info_intcodec.xml | 3 | ||||
-rw-r--r-- | configs/msmsteppe/audio_platform_info_qrd.xml | 3 | ||||
-rw-r--r-- | configs/msmsteppe/mixer_paths_idp.xml | 9 | ||||
-rw-r--r-- | configs/msmsteppe/mixer_paths_qrd.xml | 9 | ||||
-rw-r--r-- | configs/msmsteppe/mixer_paths_wcd9375.xml | 9 | ||||
-rw-r--r-- | hal/Android.mk | 2 |
19 files changed, 352 insertions, 45 deletions
diff --git a/configs/atoll/audio_platform_info_intcodec.xml b/configs/atoll/audio_platform_info_intcodec.xml index e72a83a1..b479cfc3 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 d3ea8046..e98dea5e 100644 --- a/configs/atoll/audio_platform_info_qrd.xml +++ b/configs/atoll/audio_platform_info_qrd.xml @@ -74,6 +74,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"/> @@ -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/atoll/mixer_paths.xml b/configs/atoll/mixer_paths.xml index d04fc1e5..9d7487fb 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 a3ab2f0d..f845fd4b 100644 --- a/configs/atoll/mixer_paths_qrd.xml +++ b/configs/atoll/mixer_paths_qrd.xml @@ -3044,6 +3044,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" /> @@ -3110,6 +3114,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 086dc5bf..4195193f 100644 --- a/configs/atoll/mixer_paths_wcd937x.xml +++ b/configs/atoll/mixer_paths_wcd937x.xml @@ -87,6 +87,22 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" /> <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" /> <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia3" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia6" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="0" /> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="0" /> <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" /> <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" /> <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia3" value="0" /> @@ -199,8 +215,8 @@ <!-- Multimode Voice2 --> <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" /> <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" /> - <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" /> - <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0" /> + <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" /> + <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0" /> <!-- Multimode Voice2 BTSCO --> <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="0" /> <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="0" /> @@ -320,6 +336,7 @@ <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" /> <ctl name="ADC2_MIXER Switch" value="0" /> <ctl name="ADC2 MUX" value="ZERO" /> + <ctl name="DEC0_BCS Switch" value="0" /> <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" /> <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" /> <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" /> @@ -468,6 +485,10 @@ <ctl name="EC Reference Channels" value="Two"/> </path> + <path name="echo-reference display-port1"> + <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT1" /> + </path> + <path name="echo-reference headphones-44.1"> <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" /> <ctl name="EC Reference Channels" value="Two"/> @@ -514,6 +535,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="1" /> </path> + <path name="deep-buffer-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="1" /> + </path> + <path name="deep-buffer-playback speaker-and-display-port"> <path name="deep-buffer-playback display-port" /> <path name="deep-buffer-playback" /> @@ -524,6 +549,11 @@ <path name="deep-buffer-playback" /> </path> + <path name="deep-buffer-playback speaker-and-display-port1"> + <path name="deep-buffer-playback display-port1" /> + <path name="deep-buffer-playback" /> + </path> + <path name="deep-buffer-playback bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" /> </path> @@ -623,6 +653,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" /> </path> + <path name="low-latency-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="1" /> + </path> + <path name="low-latency-playback bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" /> </path> @@ -646,6 +680,11 @@ <path name="low-latency-playback" /> </path> + <path name="low-latency-playback speaker-and-display-port1"> + <path name="low-latency-playback display-port1" /> + <path name="low-latency-playback" /> + </path> + <path name="low-latency-playback afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" /> </path> @@ -754,6 +793,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" /> </path> + <path name="audio-ull-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="1" /> + </path> + <path name="audio-ull-playback bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" /> </path> @@ -777,6 +820,11 @@ <path name="audio-ull-playback" /> </path> + <path name="audio-ull-playback speaker-and-display-port1"> + <path name="audio-ull-playback display-port1" /> + <path name="audio-ull-playback" /> + </path> + <path name="audio-ull-playback afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" /> </path> @@ -823,6 +871,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" /> </path> + <path name="multi-channel-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" /> + </path> + <path name="multi-channel-playback afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" /> </path> @@ -843,10 +895,18 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" /> </path> + <path name="compress-offload-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="1" /> + </path> + <path name="silence-playback display-port"> <ctl name="DISPLAY_PORT Mixer MultiMedia9" value="1" /> </path> + <path name="silence-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="1" /> + </path> + <path name="compress-offload-playback bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" /> </path> @@ -870,6 +930,11 @@ <path name="compress-offload-playback" /> </path> + <path name="compress-offload-playback speaker-and-display-port1"> + <path name="compress-offload-playback display-port1" /> + <path name="compress-offload-playback" /> + </path> + <path name="compress-offload-playback afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" /> </path> @@ -956,6 +1021,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" /> </path> + <path name="compress-offload-playback2 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="1" /> + </path> + <path name="compress-offload-playback2 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" /> </path> @@ -979,6 +1048,11 @@ <path name="compress-offload-playback2" /> </path> + <path name="compress-offload-playback2 speaker-and-display-port1"> + <path name="compress-offload-playback2 display-port1" /> + <path name="compress-offload-playback2" /> + </path> + <path name="compress-offload-playback2 afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" /> </path> @@ -1066,6 +1140,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" /> </path> + <path name="compress-offload-playback3 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" /> + </path> + <path name="compress-offload-playback3 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" /> </path> @@ -1089,6 +1167,11 @@ <path name="compress-offload-playback3" /> </path> + <path name="compress-offload-playback3 speaker-and-display-port1"> + <path name="compress-offload-playback3 display-port1" /> + <path name="compress-offload-playback3" /> + </path> + <path name="compress-offload-playback3 afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" /> </path> @@ -1175,6 +1258,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" /> </path> + <path name="compress-offload-playback4 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="1" /> + </path> + <path name="compress-offload-playback4 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" /> </path> @@ -1198,6 +1285,11 @@ <path name="compress-offload-playback4" /> </path> + <path name="compress-offload-playback4 speaker-and-display-port1"> + <path name="compress-offload-playback4 display-port1" /> + <path name="compress-offload-playback4" /> + </path> + <path name="compress-offload-playback4 afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" /> </path> @@ -1284,6 +1376,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" /> </path> + <path name="compress-offload-playback5 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="1" /> + </path> + <path name="compress-offload-playback5 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" /> </path> @@ -1307,6 +1403,11 @@ <path name="compress-offload-playback5" /> </path> + <path name="compress-offload-playback5 speaker-and-display-port1"> + <path name="compress-offload-playback5 display-port1" /> + <path name="compress-offload-playback5" /> + </path> + <path name="compress-offload-playback5 afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" /> </path> @@ -1393,6 +1494,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" /> </path> + <path name="compress-offload-playback6 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="1" /> + </path> + <path name="compress-offload-playback6 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" /> </path> @@ -1416,6 +1521,11 @@ <path name="compress-offload-playback6" /> </path> + <path name="compress-offload-playback6 speaker-and-display-port1"> + <path name="compress-offload-playback6 display-port1" /> + <path name="compress-offload-playback6" /> + </path> + <path name="compress-offload-playback6 afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" /> </path> @@ -1503,6 +1613,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" /> </path> + <path name="compress-offload-playback7 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="1" /> + </path> + <path name="compress-offload-playback7 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" /> </path> @@ -1526,6 +1640,11 @@ <path name="compress-offload-playback7" /> </path> + <path name="compress-offload-playback7 speaker-and-display-port1"> + <path name="compress-offload-playback7 display-port1" /> + <path name="compress-offload-playback7" /> + </path> + <path name="compress-offload-playback7 afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" /> </path> @@ -1612,6 +1731,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" /> </path> + <path name="compress-offload-playback8 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="1" /> + </path> + <path name="compress-offload-playback8 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" /> </path> @@ -1635,6 +1758,11 @@ <path name="compress-offload-playback8" /> </path> + <path name="compress-offload-playback8 speaker-and-display-port1"> + <path name="compress-offload-playback8 display-port1" /> + <path name="compress-offload-playback8" /> + </path> + <path name="compress-offload-playback8 afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" /> </path> @@ -1721,6 +1849,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" /> </path> + <path name="compress-offload-playback9 display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" /> + </path> + <path name="compress-offload-playback9 bt-sco"> <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" /> </path> @@ -1741,6 +1873,11 @@ <path name="compress-offload-playback9 speaker-safe-and-display-port"> <path name="compress-offload-playback9 display-port" /> + <path name="compress-offload-playback9" /> + </path> + + <path name="compress-offload-playback9 speaker-and-display-port1"> + <path name="compress-offload-playback9 display-port1" /> <path name="compress-offload-playback9" /> </path> @@ -2232,11 +2369,21 @@ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" /> </path> + <path name="voicemmode1-call display-port1-and-usb-headset-mic"> + <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" /> + <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" /> + </path> + <path name="voicemmode1-call display-port"> <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" /> <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" /> </path> + <path name="voicemmode1-call display-port1"> + <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" /> + <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" /> + </path> + <path name="voicemmode2-call"> <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" /> @@ -2286,11 +2433,21 @@ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" /> </path> + <path name="voicemmode2-call display-port1-and-usb-headset-mic"> + <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" /> + <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" /> + </path> + <path name="voicemmode2-call display-port"> <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" /> </path> + <path name="voicemmode2-call display-port1"> + <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" /> + <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" /> + </path> + <!-- VoIP Rx settings --> <path name="audio-playback-voip"> <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" /> @@ -2337,6 +2494,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" /> </path> + <path name="audio-playback-voip display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" /> + </path> + <path name="audio-playback-voip speaker-and-display-port"> <path name="audio-playback-voip display-port" /> <path name="audio-playback-voip" /> @@ -2344,6 +2505,11 @@ <path name="audio-playback-voip speaker-safe-and-display-port"> <path name="audio-playback-voip display-port" /> + <path name="audio-playback-voip" /> + </path> + + <path name="audio-playback-voip speaker-and-display-port1"> + <path name="audio-playback-voip display-port1" /> <path name="audio-playback-voip" /> </path> @@ -2382,48 +2548,49 @@ <!-- These are actual sound device specific mixer settings --> <path name="amic2"> - <ctl name="TX DEC5 MUX" value="SWR_MIC" /> - <ctl name="TX SMIC MUX5" value="ADC2" /> + <ctl name="TX DEC0 MUX" value="SWR_MIC" /> + <ctl name="TX SMIC MUX0" value="ADC2" /> <ctl name="TX_CDC_DMA_TX_4 Channels" value="One" /> - <ctl name="TX_AIF2_CAP Mixer DEC5" value="1" /> + <ctl name="TX_AIF2_CAP Mixer DEC0" value="1" /> + <ctl name="DEC0_BCS Switch" value="1" /> <ctl name="ADC2_MIXER Switch" value="1" /> <ctl name="ADC2 MUX" value="INP2" /> </path> <path name="dmic1"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC0" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC0" /> </path> <path name="dmic2"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC1" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC1" /> </path> <path name="dmic3"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC2" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC2" /> </path> <path name="dmic4"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC3" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC3" /> </path> <path name="dmic5"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC4" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC4" /> </path> <path name="dmic6"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC5" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC5" /> </path> <path name="speaker"> @@ -2494,7 +2661,7 @@ <path name="sidetone-headphones"> <path name="sidetone-iir" /> <ctl name="IIR0 INP0 Volume" value="54" /> - <ctl name="IIR0 INP0 MUX" value="DEC0" /> + <ctl name="IIR0 INP0 MUX" value="DEC2" /> <ctl name="RX INT0 MIX2 INP" value="SRC0" /> <ctl name="RX INT1 MIX2 INP" value="SRC0" /> </path> @@ -2502,7 +2669,7 @@ <path name="sidetone-handset"> <path name="sidetone-iir" /> <ctl name="IIR0 INP0 Volume" value="54" /> - <ctl name="IIR0 INP0 MUX" value="DEC0" /> + <ctl name="IIR0 INP0 MUX" value="DEC2" /> <ctl name="RX INT2 MIX2 INP" value="SRC0" /> <ctl name="WSA_RX0 INT0 SIDETONE MIX" value="SRC0" /> </path> @@ -2597,6 +2764,10 @@ <path name="headphones" /> </path> + <path name="headphones-hifi-filter"> + <path name="headphones" /> + </path> + <path name="hph-highquality-mode"> </path> @@ -2611,6 +2782,7 @@ </path> <path name="headset-mic"> + <ctl name="TX_DEC0 Volume" value="84" /> <path name="amic2" /> </path> @@ -2685,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" /> @@ -2729,6 +2906,9 @@ <path name="display-port"> </path> + <path name="display-port1"> + </path> + <path name="speaker-and-usb-headphones"> <path name="speaker" /> <path name="usb-headphones" /> @@ -2749,6 +2929,10 @@ <path name="display-port" /> </path> + <path name="speaker-and-display-port1"> + <path name="speaker" /> + <path name="display-port1" /> + </path> <path name="voice-rec-mic"> <path name="handset-mic" /> @@ -2785,23 +2969,23 @@ <!-- Dual MIC devices --> <path name="handset-dmic-endfire"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC0" /> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX DMIC MUX1" value="DMIC3" /> + <ctl name="TX DMIC MUX1" value="DMIC0" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC3" /> </path> <path name="speaker-dmic-endfire"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC0" /> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX DMIC MUX1" value="DMIC3" /> + <ctl name="TX DMIC MUX1" value="DMIC0" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC3" /> </path> <path name="dmic-endfire"> <path name="handset-dmic-endfire" /> - <ctl name="IIR0 INP0 MUX" value="DEC0" /> + <ctl name="IIR0 INP0 MUX" value="DEC2" /> </path> <path name="dmic-endfire-liquid"> @@ -2862,15 +3046,15 @@ </path> <path name="speaker-dmic-broadside"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC1" /> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX DMIC MUX1" value="DMIC0" /> + <ctl name="TX DMIC MUX1" value="DMIC1" /> + <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="TX DMIC MUX2" value="DMIC0" /> </path> <path name="dmic-broadside"> <path name="speaker-dmic-broadside" /> - <ctl name="IIR0 INP0 MUX" value="DEC0" /> + <ctl name="IIR0 INP0 MUX" value="DEC2" /> </path> <path name="voice-speaker-dmic-broadside"> @@ -2880,22 +3064,22 @@ <!-- Tri MIC devices --> <path name="three-mic"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC0" /> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX DMIC MUX1" value="DMIC1" /> + <ctl name="TX DMIC MUX1" value="DMIC0" /> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> - <ctl name="TX DMIC MUX2" value="DMIC3" /> + <ctl name="TX DMIC MUX2" value="DMIC1" /> + <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" /> + <ctl name="TX DMIC MUX3" value="DMIC3" /> </path> <path name="speaker-tmic"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC1" /> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX DMIC MUX1" value="DMIC0" /> + <ctl name="TX DMIC MUX1" value="DMIC1" /> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> - <ctl name="TX DMIC MUX2" value="DMIC3" /> + <ctl name="TX DMIC MUX2" value="DMIC0" /> + <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" /> + <ctl name="TX DMIC MUX3" value="DMIC3" /> </path> <path name="voice-speaker-tmic"> @@ -2905,14 +3089,14 @@ <!-- Quad MIC devices --> <path name="speaker-qmic"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Four" /> - <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="TX DMIC MUX0" value="DMIC0" /> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX DMIC MUX1" value="DMIC1" /> + <ctl name="TX DMIC MUX1" value="DMIC0" /> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> - <ctl name="TX DMIC MUX2" value="DMIC3" /> + <ctl name="TX DMIC MUX2" value="DMIC1" /> <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" /> - <ctl name="TX DMIC MUX3" value="DMIC4" /> + <ctl name="TX DMIC MUX3" value="DMIC3" /> + <ctl name="TX_AIF1_CAP Mixer DEC4" value="1" /> + <ctl name="TX DMIC MUX4" value="DMIC4" /> </path> <path name="speaker-qmic-liquid"> @@ -3282,6 +3466,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" /> </path> + <path name="mmap-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" /> + </path> + <path name="mmap-playback hdmi"> <ctl name="HDMI Mixer MultiMedia16" value="1" /> </path> @@ -3301,6 +3489,11 @@ <path name="mmap-playback" /> </path> + <path name="mmap-playback speaker-and-display-port1"> + <path name="mmap-playback display-port1" /> + <path name="mmap-playback" /> + </path> + <path name="mmap-playback speaker-and-usb-headphones"> <path name="mmap-playback usb-headphones" /> <path name="mmap-playback" /> @@ -3344,6 +3537,10 @@ <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" /> </path> + <path name="hifi-playback display-port1"> + <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" /> + </path> + <path name="hifi-playback afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" /> </path> @@ -3388,6 +3585,10 @@ <path name="incall_music_uplink" /> </path> + <path name="incall_music_uplink display-port1"> + <path name="incall_music_uplink" /> + </path> + <path name="incall_music_uplink bt-sco"> <path name="incall_music_uplink" /> </path> @@ -3408,6 +3609,10 @@ <path name="incall_music_uplink" /> </path> + <path name="incall_music_uplink speaker-and-display-port1"> + <path name="incall_music_uplink" /> + </path> + <path name="incall_music_uplink afe-proxy"> <path name="incall_music_uplink" /> </path> diff --git a/configs/kona/audio_platform_info_intcodec.xml b/configs/kona/audio_platform_info_intcodec.xml index 2d224005..a1de893b 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 bcf63aa2..44b3d807 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 776e98a8..a25db6fe 100644 --- a/configs/kona/mixer_paths.xml +++ b/configs/kona/mixer_paths.xml @@ -2198,6 +2198,10 @@ <path name="headphones" /> </path> + <path name="headphones-hifi-filter"> + <path name="headphones" /> + </path> + <path name="hph-highquality-mode"> </path> @@ -2286,6 +2290,11 @@ <path name="speaker" /> </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/kona/mixer_paths_cdp.xml b/configs/kona/mixer_paths_cdp.xml index 4357093b..65287e79 100644 --- a/configs/kona/mixer_paths_cdp.xml +++ b/configs/kona/mixer_paths_cdp.xml @@ -2238,6 +2238,10 @@ <path name="headphones" /> </path> + <path name="headphones-hifi-filter"> + <path name="headphones" /> + </path> + <path name="hph-highquality-mode"> </path> @@ -2327,6 +2331,11 @@ <path name="speaker" /> </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/kona/mixer_paths_qrd.xml b/configs/kona/mixer_paths_qrd.xml index 48a07d14..ab43c4d4 100644 --- a/configs/kona/mixer_paths_qrd.xml +++ b/configs/kona/mixer_paths_qrd.xml @@ -2605,6 +2605,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" /> @@ -2671,6 +2675,11 @@ <path name="speaker" /> </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/audio_platform_info_qrd.xml b/configs/lito/audio_platform_info_qrd.xml index 635f3212..9275188a 100644 --- a/configs/lito/audio_platform_info_qrd.xml +++ b/configs/lito/audio_platform_info_qrd.xml @@ -73,6 +73,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="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/lito/mixer_paths_qrd.xml b/configs/lito/mixer_paths_qrd.xml index 29e3e7c5..1b2b8d07 100644 --- a/configs/lito/mixer_paths_qrd.xml +++ b/configs/lito/mixer_paths_qrd.xml @@ -2852,6 +2852,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" /> @@ -2914,6 +2918,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 edfde562..ff259445 100644 --- a/configs/msm8998/msm8998.mk +++ b/configs/msm8998/msm8998.mk @@ -270,7 +270,7 @@ vendor.audio.feature.battery_listener.enable=false \ 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/msmsteppe/audio_platform_info_intcodec.xml b/configs/msmsteppe/audio_platform_info_intcodec.xml index 6273fb84..94ea8508 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 c49fcb52..10702915 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 0ae0e654..143b0b7d 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 2cd498db..32e8e4b7 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 9a1288f4..89f61911 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/hal/Android.mk b/hal/Android.mk index 5fb33229..569cd3ba 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -49,7 +49,7 @@ ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),) endif ifneq ($(filter msm8998 apq8098_latv,$(TARGET_BOARD_PLATFORM)),) LOCAL_CFLAGS := -DPLATFORM_MSM8998 - LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4" + LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="8" LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED endif ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),) |