Merge tag 'LA.UM.9.14.r1-19800-LAHAINA.QSSI13.0' into staging/lineage-19.1_merge-LA.UM.9.14.r1-19800-LAHAINA.QSSI13.0
"LA.UM.9.14.r1-19800-LAHAINA.QSSI13.0"
# By Kogara Naveen Kumar (4) and others
# Via Gerrit - the friendly Code Review server (28) and others
* tag 'LA.UM.9.14.r1-19800-LAHAINA.QSSI13.0': (38 commits)
primary-hal: Fix double free of fds
configs: set ENABLED_AUDIO_PARSERS
primary-hal: Fix issues found in static analysis
HAL: Restrict calls to ADM for low-latency usecase
hal: Add clear_devices to avoid memory leakage
audio-hal/primary-hal: Enable snd card monitor
primary-hal: BT a2dp build error fix
ahal: RTD improvement
audio-hal: Fix for the Voip TX usecase getting muted
hal: add support for hfp on qcs610 platform
audio-hal: Enable compilation of parser for QCS610
audio-hal: configs: enable value-added feature
hal: enable audio hal for kona
K5.15 Audio Techpack, fix for compilation issues.
configs: msmsteppe: enable sound trigger hidl hal 2.3
configs : Add support for AAC multichannel
audio-hal: add tinycompress soong build flags
hal: Add SpkrMono WSA support
hal: msm8974: Add speaker protetion on bengal
hal: Add speaker protetion support on LE
...
Change-Id: Iacb69a37363ca5ce43064c3465c9ff05b9502b6f
diff --git a/configs/atoll/audio_policy_configuration.xml b/configs/atoll/audio_policy_configuration.xml
index e167e4f..3d48b56 100755
--- a/configs/atoll/audio_policy_configuration.xml
+++ b/configs/atoll/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -220,7 +256,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/audio_vendor_product.mk b/configs/audio_vendor_product.mk
index 0857817..c68e42e 100644
--- a/configs/audio_vendor_product.mk
+++ b/configs/audio_vendor_product.mk
@@ -201,7 +201,7 @@
# audio specific
# ------
TARGET_USES_AOSP := true
-TARGET_USES_AOSP_FOR_AUDIO := true
+TARGET_USES_AOSP_FOR_AUDIO := false
# sdm845 specific rules
ifeq ($(TARGET_BOARD_PLATFORM),sdm845)
diff --git a/configs/bengal/audio_policy_configuration.xml b/configs/bengal/audio_policy_configuration.xml
index a1ad075..73f1a8c 100755
--- a/configs/bengal/audio_policy_configuration.xml
+++ b/configs/bengal/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -219,7 +255,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/common_au/audio_policy_configuration.xml b/configs/common_au/audio_policy_configuration.xml
index bfb6362..90e7f99 100644
--- a/configs/common_au/audio_policy_configuration.xml
+++ b/configs/common_au/audio_policy_configuration.xml
@@ -77,6 +77,26 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
+ <mixPort name="carplay_8k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_16k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_24k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_32k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_48k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
<mixPort name="nav_guidance" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -141,7 +161,7 @@
samplingRates="8000,16000,48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="primary input" role="sink">
+ <mixPort name="primary input" role="sink" maxOpenCount="3" maxActiveCount="3">
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
@@ -296,7 +316,7 @@
<route type="mix" sink="Media Bus"
sources="media"/>
<route type="mix" sink="Sys Notification Bus"
- sources="sys_notification"/>
+ sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>
<route type="mix" sink="Nav Guidance Bus"
sources="nav_guidance"/>
<route type="mix" sink="Phone Bus"
diff --git a/configs/holi/audio_policy_configuration.xml b/configs/holi/audio_policy_configuration.xml
index 8704067..d36bb68 100644
--- a/configs/holi/audio_policy_configuration.xml
+++ b/configs/holi/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -220,7 +256,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/kona/audio_policy_configuration.xml b/configs/kona/audio_policy_configuration.xml
index b6054fa..924c019 100644
--- a/configs/kona/audio_policy_configuration.xml
+++ b/configs/kona/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -218,7 +254,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/lahaina/audio_platform_info_yupikidp.xml b/configs/lahaina/audio_platform_info_yupikidp.xml
index fa65dc8..b74a356 100644
--- a/configs/lahaina/audio_platform_info_yupikidp.xml
+++ b/configs/lahaina/audio_platform_info_yupikidp.xml
@@ -148,6 +148,7 @@
<device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>
<device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="11"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="200"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" acdb_id="202"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="7"/>
<device name="SND_DEVICE_IN_BT_A2DP" acdb_id="201"/>
</acdb_ids>
diff --git a/configs/lahaina/audio_policy_configuration.xml b/configs/lahaina/audio_policy_configuration.xml
index a114315..1225a1b 100644
--- a/configs/lahaina/audio_policy_configuration.xml
+++ b/configs/lahaina/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -226,7 +262,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/lito/audio_policy_configuration.xml b/configs/lito/audio_policy_configuration.xml
index 79b8ee6..c2872d8 100644
--- a/configs/lito/audio_policy_configuration.xml
+++ b/configs/lito/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -219,7 +255,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/msm8909/audio_policy_configuration.xml b/configs/msm8909/audio_policy_configuration.xml
index 27670eb..c515818 100644
--- a/configs/msm8909/audio_policy_configuration.xml
+++ b/configs/msm8909/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -132,7 +168,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/msm8937/audio_policy_configuration.xml b/configs/msm8937/audio_policy_configuration.xml
index ddbfb5d..148b113 100644
--- a/configs/msm8937/audio_policy_configuration.xml
+++ b/configs/msm8937/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -163,7 +199,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/msm8953/audio_policy_configuration.xml b/configs/msm8953/audio_policy_configuration.xml
index e08c0d9..ebcf725 100644
--- a/configs/msm8953/audio_policy_configuration.xml
+++ b/configs/msm8953/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -174,7 +210,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/msmnile/audio_policy_configuration.xml b/configs/msmnile/audio_policy_configuration.xml
index 98ca894..d44a8ef 100644
--- a/configs/msmnile/audio_policy_configuration.xml
+++ b/configs/msmnile/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -214,7 +250,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/msmnile_au/audio_io_policy.conf b/configs/msmnile_au/audio_io_policy.conf
index 9f19dc3..fa01cf0 100644
--- a/configs/msmnile_au/audio_io_policy.conf
+++ b/configs/msmnile_au/audio_io_policy.conf
@@ -84,7 +84,7 @@
sys_notification {
flags AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION
formats AUDIO_FORMAT_PCM_16_BIT
- sampling_rates 48000
+ sampling_rates 8000|16000|24000|32000|48000
bit_width 16
app_type 69937
}
@@ -98,7 +98,7 @@
phone {
flags AUDIO_OUTPUT_FLAG_PHONE
formats AUDIO_FORMAT_PCM_16_BIT
- sampling_rates 48000
+ sampling_rates 8000|16000|24000|32000|48000
bit_width 16
app_type 69936
}
diff --git a/configs/msmnile_au/audio_platform_info.xml b/configs/msmnile_au/audio_platform_info.xml
old mode 100644
new mode 100755
index 90cc644..cdb5248
--- a/configs/msmnile_au/audio_platform_info.xml
+++ b/configs/msmnile_au/audio_platform_info.xml
@@ -139,8 +139,17 @@
<usecase name="USECASE_ICC_CALL" type="out" id="33" />
<usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="in" id="33" />
<usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="out" id="33" />
+ <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="31" />
+ <usecase name="USECASE_AUDIO_RECORD2" type="in" id="61" />
+ <usecase name="USECASE_AUDIO_RECORD3" type="in" id="62" />
</pcm_ids>
+ <soft_volume_params>
+ <vol_params name="USECASE_AUDIO_PLAYBACK_MEDIA" period="70" step="10000" curve="0"/>
+ <vol_params name="USECASE_AUDIO_PLAYBACK_SYS_NOTIFICATION" period="25" step="1000" curve="0"/>
+ <vol_params name="USECASE_AUDIO_PLAYBACK_REAR_SEAT" period="40" step="1000" curve="0"/>
+ </soft_volume_params>
+
<config_params>
<param key="spkr_1_tz_name" value="wsatz.13"/>
<param key="spkr_2_tz_name" value="wsatz.14"/>
diff --git a/configs/msmnile_au/audio_policy_configuration.xml b/configs/msmnile_au/audio_policy_configuration.xml
old mode 100644
new mode 100755
index e4533ac..a8a0f95
--- a/configs/msmnile_au/audio_policy_configuration.xml
+++ b/configs/msmnile_au/audio_policy_configuration.xml
@@ -78,6 +78,26 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
+ <mixPort name="carplay_8k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_16k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_24k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_32k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_48k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
<mixPort name="nav_guidance" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -148,13 +168,13 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_LC"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_DTS"
samplingRates="32000,44100,48000"
channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/>
@@ -172,13 +192,13 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V1"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V2"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
</mixPort>
<mixPort name="dsd_compress_passthrough" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
@@ -202,7 +222,7 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">
+ <mixPort name="primary input" role="sink" maxOpenCount="3" maxActiveCount="3">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
@@ -309,6 +329,8 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
+ <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
+ </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -333,10 +355,6 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
- <devicePort tagName="BT SCO All" type="AUDIO_DEVICE_OUT_ALL_SCO" role="sink">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
@@ -433,7 +451,7 @@
<route type="mix" sink="Media Bus"
sources="media,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Sys Notification Bus"
- sources="sys_notification,mmap_no_irq_out"/>
+ sources="sys_notification,mmap_no_irq_out,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>
<route type="mix" sink="Nav Guidance Bus"
sources="nav_guidance,mmap_no_irq_out"/>
<route type="mix" sink="Phone Bus"
@@ -446,6 +464,8 @@
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Speaker"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+ <route type="mix" sink="Speaker Safe"
+ sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Wired Headset"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Wired Headphones"
@@ -458,7 +478,7 @@
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
<route type="mix" sink="FM"
sources="primary output"/>
- <route type="mix" sink="BT SCO All"
+ <route type="mix" sink="BT SCO"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
@@ -468,20 +488,22 @@
sources="voice_tx,incall_music_uplink"/>
<route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Primary In Bus,Front Passenger In Bus,Rear Seat In Bus"/>
+ <route type="mix" sink="echo_ref"
+ sources="Echo Reference"/>
<route type="mix" sink="fast input"
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
<route type="mix" sink="voice_rx"
sources="Telephony Rx"/>
+ <route type="mix" sink="mmap_no_irq_in"
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
<route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
- <route type="mix" sink="echo_ref"
- sources="Echo Reference"/>
<route type="mix" sink="voip_tx"
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
<route type="mix" sink="record_24"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
- <route type="mix" sink="mmap_no_irq_in"
- sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
+ <route type="mix" sink="voip_tx"
+ sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
<route type="mix" sink="BT A2DP Out"
sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Headphones"
diff --git a/configs/msmnile_au/mixer_paths_adp.xml b/configs/msmnile_au/mixer_paths_adp.xml
old mode 100755
new mode 100644
index fbd1607..f6266ec
--- a/configs/msmnile_au/mixer_paths_adp.xml
+++ b/configs/msmnile_au/mixer_paths_adp.xml
@@ -26,147 +26,23 @@
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="Voice Rx Device Mute" id="0" value="0" />
- <ctl name="Voice Rx Device Mute" id="1" value="-1" />
- <ctl name="Voice Rx Device Mute" id="2" value="20" />
- <ctl name="Voice Tx Mute" id="0" value="0" />
- <ctl name="Voice Tx Mute" id="1" value="-1" />
- <ctl name="Voice Tx Mute" id="2" value="500" />
- <ctl name="Voice Rx Gain" id="0" value="0" />
- <ctl name="Voice Rx Gain" id="1" value="-1" />
- <ctl name="Voice Rx Gain" id="2" value="20" />
- <ctl name="Voice Sidetone Enable" value="0" />
- <ctl name="Voip Tx Mute" id="0" value="0" />
- <ctl name="Voip Tx Mute" id="1" value="500" />
- <ctl name="Voip Rx Gain" id="0" value="0" />
- <ctl name="Voip Rx Gain" id="1" value="20" />
- <ctl name="Voip Mode Config" value="12" />
- <ctl name="Voip Rate Config" value="0" />
- <ctl name="Voip Evrc Min Max Rate Config" id="0" value="1" />
- <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
- <ctl name="Voip Dtx Mode" value="0" />
- <ctl name="TTY Mode" value="OFF" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
- <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_8_TX" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_7_TX" value="0" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia10 Mixer SLIM_1_TX" value="0" />
- <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
<ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia3" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia6" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia9" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="0" />
- <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="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia8" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="ZERO" />
- <ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
- <!-- HFP start -->
- <ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="0" />
- <!-- HFP end -->
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
<!-- usb headset -->
@@ -184,97 +60,12 @@
<ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
<!-- usb headset end -->
- <!-- fm -->
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="0" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_8_TX" value="0" />
- <ctl name="SLIMBUS_DL_HL Switch" value="0" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="0" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
- <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia2 Mixer TERT_TDM_TX_0" value="0" />
- <!-- fm end -->
-
- <!-- Multimode Voice1 -->
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="0" />
- <!-- Multimode Voice1 BTSCO -->
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="0" />
- <!-- Multimode Voice1 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />
- <!-- Multimode Voice1 Display-Port -->
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />
- <!-- Miltimode Voice1 end-->
-
- <!-- Multimode Voice2 -->
- <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_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" />
- <!-- Multimode Voice2 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />
- <!-- Multimode Voice2 Display-Port -->
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />
- <!-- Multimode Voice2 end-->
-
- <!-- Voice external ec. reference -->
- <ctl name="VOC_EXT_EC MUX" value="NONE" />
- <!-- Voice external ec. reference end -->
<!-- RT Proxy Cal -->
<ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
<ctl name="RT_PROXY_1_TX SetCalMode" value="CAL_MODE_NONE" />
<!-- RT Proxy Cal end -->
- <!-- Incall Recording -->
- <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />
- <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />
- <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" />
- <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" />
- <!-- Incall Recording End -->
-
- <!-- Incall Music -->
- <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
- <!-- Incall Music End -->
-
- <!-- compress-voip-call start -->
- <ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="0" />
- <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="0" />
- <!-- compress-voip-call end-->
-
- <!-- Audio BTSCO -->
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
- <!-- audio record compress-->
- <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
- <!-- audio record compress end-->
-
- <!-- ADSP testfwk -->
- <ctl name="SLIMBUS_DL_HL Switch" value="0" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
- <!-- ADSP testfwk end-->
-
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
<!-- hfp-sco -->
@@ -348,84 +139,10 @@
<path name="deep-buffer-playback" />
</path>
- <path name="deep-buffer-playback display-port">
- <ctl name="DISPLAY_PORT 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" />
- </path>
-
- <path name="deep-buffer-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="deep-buffer-playback bt-sco" />
- </path>
-
<path name="deep-buffer-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="deep-buffer-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-usb-headphones">
- <path name="deep-buffer-playback usb-headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-usb-headphones">
- <path name="deep-buffer-playback usb-headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback headset">
- <path name="deep-buffer-playback headphones" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-headphones">
- <path name="deep-buffer-playback headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-headphones">
- <path name="deep-buffer-playback headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-sco">
- <path name="deep-buffer-playback bt-sco" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-bt-sco">
- <path name="deep-buffer-playback bt-sco" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-sco-wb">
- <path name="deep-buffer-playback bt-sco-wb" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-bt-sco-wb">
- <path name="deep-buffer-playback bt-sco-wb" />
- <path name="deep-buffer-playback" />
- </path>
-
<path name="low-latency-playback">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />
@@ -439,88 +156,14 @@
<path name="low-latency-playback" />
</path>
- <path name="low-latency-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="low-latency-playback bt-sco" />
- </path>
-
- <path name="low-latency-playback speaker-and-display-port">
- <path name="low-latency-playback display-port" />
- <path name="low-latency-playback" />
- </path>
-
<path name="low-latency-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
</path>
- <path name="low-latency-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback speaker-and-usb-headphones">
- <path name="low-latency-playback usb-headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-usb-headphones">
- <path name="low-latency-playback usb-headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback headset">
- <path name="low-latency-playback headphones" />
- </path>
-
- <path name="low-latency-playback speaker-and-headphones">
- <path name="low-latency-playback headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-headphones">
- <path name="low-latency-playback headphones" />
- <path name="low-latency-playback" />
- </path>
-
<path name="low-latency-playback resume">
<ctl name="MultiMedia5_RX QOS Vote" value="Enable" />
</path>
- <path name="low-latency-playback speaker-and-bt-sco">
- <path name="low-latency-playback bt-sco" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-bt-sco">
- <path name="low-latency-playback bt-sco" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-and-bt-sco-wb">
- <path name="low-latency-playback bt-sco-wb" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-bt-sco-wb">
- <path name="low-latency-playback bt-sco-wb" />
- <path name="low-latency-playback" />
- </path>
-
<path name="audio-ull-playback">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="1" />
@@ -534,78 +177,10 @@
<path name="audio-ull-playback" />
</path>
- <path name="audio-ull-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback headset">
- <path name="audio-ull-playback headphones" />
- </path>
-
- <path name="audio-ull-playback speaker-and-headphones">
- <path name="audio-ull-playback" />
- <path name="audio-ull-playback headphones" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-headphones">
- <path name="audio-ull-playback" />
- <path name="audio-ull-playback headphones" />
- </path>
-
- <path name="audio-ull-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-ull-playback bt-sco" />
- </path>
-
- <path name="audio-ull-playback speaker-and-display-port">
- <path name="audio-ull-playback display-port" />
- <path name="audio-ull-playback" />
- </path>
-
<path name="audio-ull-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
</path>
- <path name="audio-ull-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-sco">
- <path name="audio-ull-playback bt-sco" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-bt-sco">
- <path name="audio-ull-playback bt-sco" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-sco-wb">
- <path name="audio-ull-playback bt-sco-wb" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-bt-sco-wb">
- <path name="audio-ull-playback bt-sco-wb" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="multi-channel-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
- </path>
-
<path name="multi-channel-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -623,685 +198,82 @@
<path name="compress-offload-playback" />
</path>
- <path name="compress-offload-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="silence-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback bt-sco" />
- </path>
-
- <path name="compress-offload-playback speaker-and-display-port">
- <path name="compress-offload-playback display-port" />
- <path name="compress-offload-playback" />
- </path>
-
<path name="compress-offload-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback speaker-and-usb-headphones">
- <path name="compress-offload-playback usb-headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-usb-headphones">
- <path name="compress-offload-playback usb-headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback headset">
- <path name="compress-offload-playback headphones" />
- </path>
-
- <path name="compress-offload-playback headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback speaker-and-headphones">
- <path name="compress-offload-playback headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-headphones">
- <path name="compress-offload-playback headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-sco">
- <path name="compress-offload-playback bt-sco" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-bt-sco">
- <path name="compress-offload-playback bt-sco" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-sco-wb">
- <path name="compress-offload-playback bt-sco-wb" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-bt-sco-wb">
- <path name="compress-offload-playback bt-sco-wb" />
- <path name="compress-offload-playback" />
- </path>
-
<path name="compress-offload-playback2">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="1" />
</path>
- <path name="compress-offload-playback2 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback2 bt-sco" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-display-port">
- <path name="compress-offload-playback2 display-port" />
- <path name="compress-offload-playback2" />
- </path>
-
<path name="compress-offload-playback2 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
</path>
- <path name="compress-offload-playback2 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-usb-headphones">
- <path name="compress-offload-playback2 usb-headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-usb-headphones">
- <path name="compress-offload-playback2 usb-headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 headset">
- <path name="compress-offload-playback2 headphones" />
- </path>
-
- <path name="compress-offload-playback2 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-headphones">
- <path name="compress-offload-playback2 headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-headphones">
- <path name="compress-offload-playback2 headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-sco">
- <path name="compress-offload-playback2 bt-sco" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-bt-sco">
- <path name="compress-offload-playback2 bt-sco" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback2 bt-sco-wb" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-bt-sco-wb">
- <path name="compress-offload-playback2 bt-sco-wb" />
- <path name="compress-offload-playback2" />
- </path>
-
<path name="compress-offload-playback3">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="compress-offload-playback3 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback3 bt-sco" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-display-port">
- <path name="compress-offload-playback3 display-port" />
- <path name="compress-offload-playback3" />
- </path>
-
<path name="compress-offload-playback3 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="compress-offload-playback3 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-usb-headphones">
- <path name="compress-offload-playback3 usb-headphones" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 headset">
- <path name="compress-offload-playback3 headphones" />
- </path>
-
- <path name="compress-offload-playback3 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-headphones">
- <path name="compress-offload-playback3 headphones" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-sco">
- <path name="compress-offload-playback3 bt-sco" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback3 bt-sco-wb" />
- <path name="compress-offload-playback3" />
- </path>
-
<path name="compress-offload-playback4">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="1" />
</path>
- <path name="compress-offload-playback4 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback4 bt-sco" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-display-port">
- <path name="compress-offload-playback4 display-port" />
- <path name="compress-offload-playback4" />
- </path>
-
-
<path name="compress-offload-playback4 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
</path>
- <path name="compress-offload-playback4 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-usb-headphones">
- <path name="compress-offload-playback4 usb-headphones" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 headset">
- <path name="compress-offload-playback4 headphones" />
- </path>
-
- <path name="compress-offload-playback4 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-headphones">
- <path name="compress-offload-playback4 headphones" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-sco">
- <path name="compress-offload-playback4 bt-sco" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback4 bt-sco-wb" />
- <path name="compress-offload-playback4" />
- </path>
-
<path name="compress-offload-playback5">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="1" />
</path>
- <path name="compress-offload-playback5 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback5 bt-sco" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-display-port">
- <path name="compress-offload-playback5 display-port" />
- <path name="compress-offload-playback5" />
- </path>
-
<path name="compress-offload-playback5 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
</path>
- <path name="compress-offload-playback5 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-usb-headphones">
- <path name="compress-offload-playback5 usb-headphones" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 headset">
- <path name="compress-offload-playback5 headphones" />
- </path>
-
- <path name="compress-offload-playback5 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-headphones">
- <path name="compress-offload-playback5 headphones" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-sco">
- <path name="compress-offload-playback5 bt-sco" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback5 bt-sco-wb" />
- <path name="compress-offload-playback5" />
- </path>
-
<path name="compress-offload-playback6">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="1" />
</path>
- <path name="compress-offload-playback6 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback6 bt-sco" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-display-port">
- <path name="compress-offload-playback6 display-port" />
- <path name="compress-offload-playback6" />
- </path>
-
<path name="compress-offload-playback6 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
</path>
- <path name="compress-offload-playback6 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-usb-headphones">
- <path name="compress-offload-playback6 usb-headphones" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 headset">
- <path name="compress-offload-playback6 headphones" />
- </path>
-
- <path name="compress-offload-playback6 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-headphones">
- <path name="compress-offload-playback6 headphones" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-sco">
- <path name="compress-offload-playback6 bt-sco" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback6 bt-sco-wb" />
- <path name="compress-offload-playback6" />
- </path>
-
<path name="compress-offload-playback7">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="1" />
</path>
- <path name="compress-offload-playback7 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback7 bt-sco" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-display-port">
- <path name="compress-offload-playback7 display-port" />
- <path name="compress-offload-playback7" />
- </path>
-
<path name="compress-offload-playback7 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
</path>
- <path name="compress-offload-playback7 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-usb-headphones">
- <path name="compress-offload-playback7 usb-headphones" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 headset">
- <path name="compress-offload-playback7 headphones" />
- </path>
-
- <path name="compress-offload-playback7 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-headphones">
- <path name="compress-offload-playback7 headphones" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-sco">
- <path name="compress-offload-playback7 bt-sco" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback7 bt-sco-wb" />
- <path name="compress-offload-playback7" />
- </path>
-
<path name="compress-offload-playback8">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="1" />
</path>
- <path name="compress-offload-playback8 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback8 bt-sco" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-display-port">
- <path name="compress-offload-playback8 display-port" />
- <path name="compress-offload-playback8" />
- </path>
-
<path name="compress-offload-playback8 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
</path>
- <path name="compress-offload-playback8 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-usb-headphones">
- <path name="compress-offload-playback8 usb-headphones" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 headset">
- <path name="compress-offload-playback8 headphones" />
- </path>
-
- <path name="compress-offload-playback8 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-headphones">
- <path name="compress-offload-playback8 headphones" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-sco">
- <path name="compress-offload-playback8 bt-sco" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback8 bt-sco-wb" />
- <path name="compress-offload-playback8" />
- </path>
-
<path name="compress-offload-playback9">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="compress-offload-playback9 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback9 bt-sco" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-display-port">
- <path name="compress-offload-playback9 display-port" />
- <path name="compress-offload-playback9" />
- </path>
-
<path name="compress-offload-playback9 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="compress-offload-playback9 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-usb-headphones">
- <path name="compress-offload-playback9 usb-headphones" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 headset">
- <path name="compress-offload-playback9 headphones" />
- </path>
-
- <path name="compress-offload-playback9 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-headphones">
- <path name="compress-offload-playback9 headphones" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-sco">
- <path name="compress-offload-playback9 bt-sco" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback9 bt-sco-wb" />
- <path name="compress-offload-playback9" />
- </path>
-
<!-- The following use cases are used for car streams -->
<path name="media-playback">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
@@ -1339,6 +311,18 @@
<ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
</path>
+ <path name="audio-record2">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="MultiMedia33 Mixer TERT_TDM_TX_0" value="1" />
+ <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
+ </path>
+
+ <path name="audio-record3">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="MultiMedia34 Mixer TERT_TDM_TX_0" value="1" />
+ <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
+ </path>
+
<path name="front-passenger-record">
<ctl name="QUAT_TDM_TX_0 Channels" value="Eight" />
<ctl name="MultiMedia23 Mixer QUAT_TDM_TX_0" value="1" />
@@ -1354,19 +338,6 @@
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="audio-record usb-headset-mic">
- <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record bt-sco">
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record bt-sco" />
- </path>
-
<path name="audio-record capture-fm">
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
@@ -1386,19 +357,6 @@
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="audio-record-compress bt-sco">
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-compress bt-sco" />
- </path>
-
- <path name="audio-record-compress usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
<path name="audio-record-compress2">
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia17 Mixer TERT_TDM_TX_0" value="1" />
@@ -1409,19 +367,6 @@
<ctl name="MultiMedia17 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="audio-record-compress2 usb-headset-mic">
- <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-compress2 bt-sco">
- <ctl name="MultiMedia17 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-compress2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-compress2 bt-sco" />
- </path>
-
<path name="low-latency-record">
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
@@ -1432,19 +377,6 @@
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="low-latency-record bt-sco">
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="low-latency-record bt-sco" />
- </path>
-
- <path name="low-latency-record usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
<path name="low-latency-record capture-fm">
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
@@ -1455,168 +387,6 @@
<ctl name="MultiMedia2 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="play-fm">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
-
- <path name="play-fm headphones">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
- </path>
-
- <path name="play-fm headset">
- <path name="play-fm headphones" />
- </path>
-
- <path name="incall-rec-uplink">
- <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
- </path>
-
- <path name="incall-rec-uplink bt-sco">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink bt-sco-wb">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink usb-headset-mic">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink headset-mic">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink afe-proxy">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink-compress">
- <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
- </path>
-
- <path name="incall-rec-uplink-compress headset-mic">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress bt-sco">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress bt-sco-wb">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress usb-headset-mic">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress afe-proxy">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-downlink">
- <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
- </path>
-
- <path name="incall-rec-downlink bt-sco">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink bt-sco-wb">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink usb-headset-mic">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink headset-mic">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink afe-proxy">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink-compress">
- <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" />
- </path>
-
- <path name="incall-rec-downlink-compress headset-mic">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress bt-sco">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress bt-sco-wb">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress usb-headset-mic">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress afe-proxy">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink">
- <path name="incall-rec-uplink" />
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink bt-sco">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink bt-sco-wb">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink headset-mic">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink afe-proxy">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress">
- <path name="incall-rec-uplink-compress" />
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress bt-sco">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress headset-mic">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress bt-sco-wb">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress afe-proxy">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
<path name="icc-call">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
@@ -1691,223 +461,17 @@
<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" />
- </path>
-
- <path name="compress-voip-call bt-a2dp">
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call headset">
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_1_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-voip-call bt-sco" />
- </path>
-
- <path name="compress-voip-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="1" />
- </path>
-
- <path name="voicemmode1-call">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call headphones">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call headset">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="voicemmode1-call bt-sco" />
- </path>
-
- <path name="voicemmode1-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call display-port-and-usb-headset-mic">
- <ctl name="DISPLAY_PORT_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 TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode2-call">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call headphones">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call headset">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="voicemmode2-call bt-sco" />
- </path>
-
- <path name="voicemmode2-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call display-port-and-usb-headset-mic">
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_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 TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
<!-- VoIP Rx settings -->
<path name="audio-playback-voip">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="audio-playback-voip headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip headset">
- <path name="audio-playback-voip headphones" />
- </path>
-
- <path name="audio-playback-voip bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-playback-voip bt-sco" />
- </path>
-
- <path name="audio-playback-voip bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
<path name="audio-playback-voip afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="audio-playback-voip usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip display-port">
- <ctl name="DISPLAY_PORT 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" />
- </path>
-
<!-- VoIP Tx settings -->
- <path name="audio-record-voip">
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record-voip headset-mic">
- <ctl name="MultiMedia10 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="audio-record-voip usb-headset-mic">
- <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-voip bt-sco">
- <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-voip bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-voip bt-sco" />
- </path>
- <path name="spkr-rx-calib">
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
<path name="spkr-vi-record">
</path>
@@ -1995,10 +559,6 @@
<path name="sidetone-iir" />
</path>
- <path name="afe-sidetone">
- <ctl name="Voice Sidetone Enable" value="1" />
- </path>
-
<path name="speaker-mic">
<path name="dmic3" />
</path>
@@ -2482,41 +1042,6 @@
<path name="tty-headphones">
</path>
- <path name="voice-tty-full-headphones">
- <ctl name="TTY Mode" value="FULL" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-full-headset">
- <ctl name="TTY Mode" value="FULL" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-vco-headphones">
- <ctl name="TTY Mode" value="VCO" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-vco-headset">
- <ctl name="TTY Mode" value="VCO" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-hco-handset">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset" />
- </path>
-
- <path name="voice-tty-hco-handset-qrd">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-tty-hco-handset-hdk">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset-qrd" />
- </path>
-
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
</path>
@@ -2555,21 +1080,11 @@
<!-- USB TTY start -->
<!-- full: both end tty -->
- <path name="voice-tty-full-usb">
- <ctl name="TTY Mode" value="FULL" />
- <path name="usb-headphones" />
- </path>
<path name="voice-tty-full-usb-mic">
<path name="usb-headset-mic" />
</path>
- <!-- vco, in: handset mic use existing, out: tty -->
- <path name="voice-tty-vco-usb">
- <ctl name="TTY Mode" value="VCO" />
- <path name="usb-headphones" />
- </path>
-
<!-- hco, in: tty, out: speaker, use existing handset -->
<path name="voice-tty-hco-usb-mic">
<path name="voice-tty-full-usb-mic" />
@@ -2578,156 +1093,6 @@
<!-- USB TTY end -->
<!-- Added for ADSP testfwk -->
- <path name="ADSP testfwk">
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
-
- <path name="bt-a2dp">
- <ctl name="SLIM7_RX ADM Channels" value="Two" />
- </path>
-
- <path name="speaker-and-bt-a2dp">
- <path name="speaker" />
- <path name="bt-a2dp" />
- </path>
-
- <path name="speaker-safe-and-bt-a2dp">
- <path name="speaker-safe" />
- <path name="bt-a2dp" />
- </path>
-
- <path name="deep-buffer-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="low-latency-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-a2dp">
- <path name="deep-buffer-playback bt-a2dp" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-bt-a2dp">
- <path name="deep-buffer-playback bt-a2dp" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-a2dp">
- <path name="compress-offload-playback bt-a2dp" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-bt-a2dp">
- <path name="compress-offload-playback bt-a2dp" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="low-latency-playback speaker-and-bt-a2dp">
- <path name="low-latency-playback bt-a2dp" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-bt-a2dp">
- <path name="low-latency-playback bt-a2dp" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-a2dp">
- <path name="compress-offload-playback2 bt-a2dp" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-bt-a2dp">
- <path name="compress-offload-playback2 bt-a2dp" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-a2dp">
- <path name="compress-offload-playback3 bt-a2dp" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-a2dp">
- <path name="compress-offload-playback4 bt-a2dp" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-a2dp">
- <path name="compress-offload-playback5 bt-a2dp" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-a2dp">
- <path name="compress-offload-playback6 bt-a2dp" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-a2dp">
- <path name="compress-offload-playback7 bt-a2dp" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-a2dp">
- <path name="compress-offload-playback8 bt-a2dp" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-a2dp">
- <path name="compress-offload-playback9 bt-a2dp" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-a2dp">
- <path name="audio-ull-playback bt-a2dp" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-bt-a2dp">
- <path name="audio-ull-playback bt-a2dp" />
- <path name="audio-ull-playback" />
- </path>
<path name="mmap-playback">
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
@@ -2753,282 +1118,12 @@
<ctl name="QUIN_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="mmap-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback headset">
- <path name="mmap-playback headphones" />
- </path>
-
- <path name="mmap-playback speaker-and-headphones">
- <path name="mmap-playback" />
- <path name="mmap-playback headphones" />
- </path>
-
- <path name="mmap-playback speaker-safe-and-headphones">
- <path name="mmap-playback" />
- <path name="mmap-playback headphones" />
- </path>
-
- <path name="mmap-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="mmap-playback bt-sco" />
- </path>
-
<path name="mmap-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="mmap-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback hdmi">
- <ctl name="HDMI Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback speaker-and-hdmi">
- <path name="mmap-playback hdmi" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-and-display-port">
- <path name="mmap-playback display-port" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-and-usb-headphones">
- <path name="mmap-playback usb-headphones" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-safe-and-usb-headphones">
- <path name="mmap-playback usb-headphones" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-record">
- <ctl name="MultiMedia16 Mixer TERT_TDM_TX_0" value="1" />
- </path>
-
- <path name="mmap-record headset-mic">
- <ctl name="MultiMedia16 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="mmap-record bt-sco">
- <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="mmap-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="mmap-record bt-sco" />
- </path>
-
- <path name="mmap-record capture-fm">
- <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="1" />
- </path>
-
- <path name="mmap-record usb-headset-mic">
- <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="hifi-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
- </path>
-
<path name="hifi-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
- <path name="hifi-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-record">
- <ctl name="MultiMedia2 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="hifi-record headset-mic">
- <ctl name="MultiMedia2 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="hifi-record usb-headset-mic">
- <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="incall_music_uplink">
- <ctl name="Incall_Music Audio Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="incall_music_uplink speaker">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink handset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink handset-hac">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink display-port">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-sco-wb">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-display-port">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink afe-proxy">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink usb-headset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink voice-tty-hco-handset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
- <path name="incall_music_uplink2">
- <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="incall_music_uplink2 speaker">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 handset">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 handset-hac">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 display-port">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 bt-sco">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 bt-sco-wb">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-display-port">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 afe-proxy">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 usb-headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 usb-headset">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-usb-headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-bt-sco">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 voice-tty-hco-handset">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-bt-a2dp">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 bt-a2dp">
- <path name="incall_music_uplink2" />
- </path>
</mixer>
diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
old mode 100755
new mode 100644
index c5cceea..376bc7b
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -12,11 +12,11 @@
ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS),true)
-USE_CUSTOM_AUDIO_POLICY := 1
+USE_CUSTOM_AUDIO_POLICY := 0
else
USE_CUSTOM_AUDIO_POLICY := 0
endif
-AUDIO_FEATURE_QSSI_COMPLIANCE := true
+AUDIO_FEATURE_QSSI_COMPLIANCE := false
AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false
AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true
AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := true
@@ -49,6 +49,10 @@
AUDIO_FEATURE_ENABLED_AHAL_EXT := false
DOLBY_ENABLE := false
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
+AUDIO_FEATURE_ENABLED_SOFT_VOLUME:= true
+SOONG_CONFIG_NAMESPACES += tinycompressnamespace
+SOONG_CONFIG_tinycompressnamespace := ext_compress_format_enabled
+SOONG_CONFIG_tinycompressnamespace_ext_compress_format_enabled := true
endif
USE_XML_AUDIO_POLICY_CONF := 1
@@ -84,14 +88,16 @@
AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
BOARD_SUPPORTS_QAHW := false
AUDIO_FEATURE_ENABLED_RAS := true
-AUDIO_FEATURE_ENABLED_SND_MONITOR := false
AUDIO_FEATURE_ENABLED_DLKM := true
AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false
AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false
+AUDIO_FEATURE_ENABLED_SOFT_VOLUME:= true
##AUDIO_FEATURE_FLAGS
+ifneq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
AUDIO_HARDWARE += audio.a2dp.default
+endif
AUDIO_HARDWARE += audio.usb.default
AUDIO_HARDWARE += audio.r_submix.default
AUDIO_HARDWARE += audio.primary.msmnile
@@ -121,12 +127,18 @@
AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT := false
AUDIO_FEATURE_ENABLED_SILENT_BOOT := false
endif
+AUDIO_FEATURE_ENABLED_SND_MONITOR := false
+else
+AUDIO_FEATURE_ENABLED_SND_MONITOR := true
endif
AUDIO_FEATURE_ENABLED_FM_TUNER_EXT := true
AUDIO_FEATURE_ENABLED_ICC := true
ifneq ( ,$(filter S 12, $(PLATFORM_VERSION)))
AUDIO_FEATURE_ENABLED_POWER_POLICY := true
endif
+ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX), msmnile_gvmq)
+AUDIO_FEATURE_ENABLED_AUDIO_PARSERS := true
+endif
##AUTOMOTIVE_AUDIO_FEATURE_FLAGS
ifneq ($(strip $(TARGET_USES_RRO)), true)
@@ -384,7 +396,7 @@
vendor.audio.feature.compress_in.enable=false \
vendor.audio.feature.compress_meta_data.enable=false \
vendor.audio.feature.compr_voip.enable=false \
-vendor.audio.feature.concurrent_capture.enable=false \
+vendor.audio.feature.concurrent_capture.enable=true \
vendor.audio.feature.custom_stereo.enable=false \
vendor.audio.feature.display_port.enable=false \
vendor.audio.feature.dsm_feedback.enable=false \
@@ -417,10 +429,17 @@
vendor.audio.feature.vbat.enable=false \
vendor.audio.feature.wsa.enable=false \
vendor.audio.feature.audiozoom.enable=false \
-vendor.audio.feature.snd_mon.enable=false \
vendor.audio.feature.auto_hal.enable=true \
vendor.audio.feature.synth.enable=true \
-vendor.audio.feature.powerpolicy.enable=true
+vendor.audio.feature.powerpolicy.enable=true \
+vendor.audio.feature.concurrent_pcm_record.enable=true
+ifeq ($(AUDIO_FEATURE_ENABLED_SND_MONITOR), true)
+PRODUCT_ODM_PROPERTIES += \
+vendor.audio.feature.snd_mon.enable=true
+else
+PRODUCT_ODM_PROPERTIES += \
+vendor.audio.feature.snd_mon.enable=false
+endif
else
# Non-Generic ODM varient related
PRODUCT_ODM_PROPERTIES += \
@@ -432,7 +451,7 @@
vendor.audio.feature.compress_in.enable=true \
vendor.audio.feature.compress_meta_data.enable=true \
vendor.audio.feature.compr_voip.enable=false \
-vendor.audio.feature.concurrent_capture.enable=false \
+vendor.audio.feature.concurrent_capture.enable=true \
vendor.audio.feature.custom_stereo.enable=true \
vendor.audio.feature.display_port.enable=true \
vendor.audio.feature.dsm_feedback.enable=false \
@@ -465,10 +484,17 @@
vendor.audio.feature.vbat.enable=true \
vendor.audio.feature.wsa.enable=false \
vendor.audio.feature.audiozoom.enable=false \
-vendor.audio.feature.snd_mon.enable=false \
vendor.audio.feature.auto_hal.enable=true \
vendor.audio.feature.synth.enable=true \
-vendor.audio.feature.powerpolicy.enable=true
+vendor.audio.feature.powerpolicy.enable=true \
+vendor.audio.feature.concurrent_pcm_record.enable=true
+ifeq ($(AUDIO_FEATURE_ENABLED_SND_MONITOR), true)
+PRODUCT_ODM_PROPERTIES += \
+vendor.audio.feature.snd_mon.enable=true
+else
+PRODUCT_ODM_PROPERTIES += \
+vendor.audio.feature.snd_mon.enable=false
+endif
endif
# for HIDL related packages
@@ -513,7 +539,7 @@
AudioSettings
# for HIDL related audiocontrol packages
-ifneq ($(PLATFORM_VERSION), 12)
+ifeq ( ,$(filter 12 Tiramisu,$(PLATFORM_VERSION)))
PRODUCT_PACKAGES += \
android.hardware.automotive.audiocontrol@2.0-service \
android.hardware.automotive.audiocontrol@2.0
diff --git a/configs/msmsteppe/audio_policy_configuration.xml b/configs/msmsteppe/audio_policy_configuration.xml
index 0a31d24..4442be8 100644
--- a/configs/msmsteppe/audio_policy_configuration.xml
+++ b/configs/msmsteppe/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -214,7 +250,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/msmsteppe/msmsteppe.mk b/configs/msmsteppe/msmsteppe.mk
index c96d6fa..f672769 100644
--- a/configs/msmsteppe/msmsteppe.mk
+++ b/configs/msmsteppe/msmsteppe.mk
@@ -354,6 +354,10 @@
android.hardware.audio.effect@6.0 \
android.hardware.audio.effect@6.0-impl
+# enable sound trigger hidl hal 2.3
+PRODUCT_PACKAGES += \
+ android.hardware.soundtrigger@2.3-impl \
+
PRODUCT_PACKAGES_ENG += \
VoicePrintTest \
VoicePrintDemo
diff --git a/configs/msmsteppe_au/audio_io_policy.conf b/configs/msmsteppe_au/audio_io_policy.conf
index e45b296..412c248 100644
--- a/configs/msmsteppe_au/audio_io_policy.conf
+++ b/configs/msmsteppe_au/audio_io_policy.conf
@@ -84,7 +84,7 @@
sys_notification {
flags AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION
formats AUDIO_FORMAT_PCM_16_BIT
- sampling_rates 48000
+ sampling_rates 8000|16000|24000|32000|48000
bit_width 16
app_type 69937
}
@@ -98,7 +98,7 @@
phone {
flags AUDIO_OUTPUT_FLAG_PHONE
formats AUDIO_FORMAT_PCM_16_BIT
- sampling_rates 48000
+ sampling_rates 8000|16000|24000|32000|48000
bit_width 16
app_type 69936
}
diff --git a/configs/msmsteppe_au/audio_platform_info.xml b/configs/msmsteppe_au/audio_platform_info.xml
index 8cc7b04..15e865d 100644
--- a/configs/msmsteppe_au/audio_platform_info.xml
+++ b/configs/msmsteppe_au/audio_platform_info.xml
@@ -139,6 +139,9 @@
<usecase name="USECASE_ICC_CALL" type="out" id="33" />
<usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="in" id="33" />
<usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="out" id="33" />
+ <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="31" />
+ <usecase name="USECASE_AUDIO_RECORD2" type="in" id="61" />
+ <usecase name="USECASE_AUDIO_RECORD3" type="in" id="62" />
</pcm_ids>
<config_params>
diff --git a/configs/msmsteppe_au/audio_policy_configuration.xml b/configs/msmsteppe_au/audio_policy_configuration.xml
index ea6e0e3..a8a0f95 100644
--- a/configs/msmsteppe_au/audio_policy_configuration.xml
+++ b/configs/msmsteppe_au/audio_policy_configuration.xml
@@ -78,6 +78,26 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
+ <mixPort name="carplay_8k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_16k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_24k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_32k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ <mixPort name="carplay_48k_sys" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
<mixPort name="nav_guidance" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -148,13 +168,13 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_LC"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_DTS"
samplingRates="32000,44100,48000"
channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/>
@@ -172,13 +192,13 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V1"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
<profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V2"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_5POINT1"/>
</mixPort>
<mixPort name="dsd_compress_passthrough" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
@@ -195,8 +215,14 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
+ <mixPort name="incall_music_uplink" role="source"
+ flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="8000,16000,48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
- <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">
+ <mixPort name="primary input" role="sink" maxOpenCount="3" maxActiveCount="3">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
@@ -206,13 +232,7 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
</mixPort>
- <mixPort name="incall_music_uplink" role="source"
- flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
- </mixPort>
- <mixPort name="record_24" role="sink">
+ <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
@@ -309,6 +329,8 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
+ <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
+ </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -333,10 +355,6 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
- <devicePort tagName="BT SCO All" type="AUDIO_DEVICE_OUT_ALL_SCO" role="sink">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
@@ -354,17 +372,17 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
- encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX_TWSP">
+ encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
- encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX_TWSP">
+ encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
- encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX_TWSP">
+ encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
@@ -433,7 +451,7 @@
<route type="mix" sink="Media Bus"
sources="media,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Sys Notification Bus"
- sources="sys_notification,mmap_no_irq_out"/>
+ sources="sys_notification,mmap_no_irq_out,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>
<route type="mix" sink="Nav Guidance Bus"
sources="nav_guidance,mmap_no_irq_out"/>
<route type="mix" sink="Phone Bus"
@@ -446,6 +464,8 @@
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Speaker"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+ <route type="mix" sink="Speaker Safe"
+ sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Wired Headset"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Wired Headphones"
@@ -458,7 +478,7 @@
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
<route type="mix" sink="FM"
sources="primary output"/>
- <route type="mix" sink="BT SCO All"
+ <route type="mix" sink="BT SCO"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
@@ -468,20 +488,22 @@
sources="voice_tx,incall_music_uplink"/>
<route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Primary In Bus,Front Passenger In Bus,Rear Seat In Bus"/>
+ <route type="mix" sink="echo_ref"
+ sources="Echo Reference"/>
<route type="mix" sink="fast input"
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
<route type="mix" sink="voice_rx"
sources="Telephony Rx"/>
+ <route type="mix" sink="mmap_no_irq_in"
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
<route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
- <route type="mix" sink="echo_ref"
- sources="Echo Reference"/>
<route type="mix" sink="voip_tx"
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
<route type="mix" sink="record_24"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
- <route type="mix" sink="mmap_no_irq_in"
- sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
+ <route type="mix" sink="voip_tx"
+ sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
<route type="mix" sink="BT A2DP Out"
sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
<route type="mix" sink="BT A2DP Headphones"
diff --git a/configs/msmsteppe_au/mixer_paths_adp.xml b/configs/msmsteppe_au/mixer_paths_adp.xml
index 0fef0ca..1036498 100644
--- a/configs/msmsteppe_au/mixer_paths_adp.xml
+++ b/configs/msmsteppe_au/mixer_paths_adp.xml
@@ -27,146 +27,23 @@
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="Voice Rx Device Mute" id="0" value="0" />
- <ctl name="Voice Rx Device Mute" id="1" value="-1" />
- <ctl name="Voice Rx Device Mute" id="2" value="20" />
- <ctl name="Voice Tx Mute" id="0" value="0" />
- <ctl name="Voice Tx Mute" id="1" value="-1" />
- <ctl name="Voice Tx Mute" id="2" value="500" />
- <ctl name="Voice Rx Gain" id="0" value="0" />
- <ctl name="Voice Rx Gain" id="1" value="-1" />
- <ctl name="Voice Rx Gain" id="2" value="20" />
- <ctl name="Voice Sidetone Enable" value="0" />
- <ctl name="Voip Tx Mute" id="0" value="0" />
- <ctl name="Voip Tx Mute" id="1" value="500" />
- <ctl name="Voip Rx Gain" id="0" value="0" />
- <ctl name="Voip Rx Gain" id="1" value="20" />
- <ctl name="Voip Mode Config" value="12" />
- <ctl name="Voip Rate Config" value="0" />
- <ctl name="Voip Evrc Min Max Rate Config" id="0" value="1" />
- <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
- <ctl name="Voip Dtx Mode" value="0" />
- <ctl name="TTY Mode" value="OFF" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
- <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_8_TX" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_7_TX" value="0" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
<ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia3" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia6" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia9" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="0" />
- <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="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia8" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="ZERO" />
- <ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
- <!-- HFP start -->
- <ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="0" />
- <!-- HFP end -->
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
<!-- usb headset -->
@@ -184,97 +61,12 @@
<ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
<!-- usb headset end -->
- <!-- fm -->
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="0" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_8_TX" value="0" />
- <ctl name="SLIMBUS_DL_HL Switch" value="0" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="0" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
- <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia2 Mixer TERT_TDM_TX_0" value="0" />
- <!-- fm end -->
-
- <!-- Multimode Voice1 -->
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="0" />
- <!-- Multimode Voice1 BTSCO -->
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="0" />
- <!-- Multimode Voice1 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />
- <!-- Multimode Voice1 Display-Port -->
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />
- <!-- Miltimode Voice1 end-->
-
- <!-- Multimode Voice2 -->
- <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_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" />
- <!-- Multimode Voice2 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />
- <!-- Multimode Voice2 Display-Port -->
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />
- <!-- Multimode Voice2 end-->
-
- <!-- Voice external ec. reference -->
- <ctl name="VOC_EXT_EC MUX" value="NONE" />
- <!-- Voice external ec. reference end -->
<!-- RT Proxy Cal -->
<ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
<ctl name="RT_PROXY_1_TX SetCalMode" value="CAL_MODE_NONE" />
<!-- RT Proxy Cal end -->
- <!-- Incall Recording -->
- <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />
- <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />
- <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" />
- <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" />
- <!-- Incall Recording End -->
-
- <!-- Incall Music -->
- <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
- <!-- Incall Music End -->
-
- <!-- compress-voip-call start -->
- <ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="0" />
- <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="0" />
- <!-- compress-voip-call end-->
-
- <!-- Audio BTSCO -->
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
- <!-- audio record compress-->
- <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
- <!-- audio record compress end-->
-
- <!-- ADSP testfwk -->
- <ctl name="SLIMBUS_DL_HL Switch" value="0" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
- <!-- ADSP testfwk end-->
-
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
<!-- hfp-sco -->
@@ -340,60 +132,10 @@
<path name="deep-buffer-playback" />
</path>
- <path name="deep-buffer-playback display-port">
- <ctl name="DISPLAY_PORT 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" />
- </path>
-
- <path name="deep-buffer-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="deep-buffer-playback bt-sco" />
- </path>
-
<path name="deep-buffer-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="deep-buffer-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-usb-headphones">
- <path name="deep-buffer-playback usb-headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-headphones">
- <path name="deep-buffer-playback headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-sco">
- <path name="deep-buffer-playback bt-sco" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-sco-wb">
- <path name="deep-buffer-playback bt-sco-wb" />
- <path name="deep-buffer-playback" />
- </path>
-
<path name="low-latency-playback">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />
@@ -403,64 +145,14 @@
<path name="low-latency-playback" />
</path>
- <path name="low-latency-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="low-latency-playback bt-sco" />
- </path>
-
- <path name="low-latency-playback speaker-and-display-port">
- <path name="low-latency-playback display-port" />
- <path name="low-latency-playback" />
- </path>
-
<path name="low-latency-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
</path>
- <path name="low-latency-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback speaker-and-usb-headphones">
- <path name="low-latency-playback usb-headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback speaker-and-headphones">
- <path name="low-latency-playback headphones" />
- <path name="low-latency-playback" />
- </path>
-
<path name="low-latency-playback resume">
<ctl name="MultiMedia5_RX QOS Vote" value="Enable" />
</path>
- <path name="low-latency-playback speaker-and-bt-sco">
- <path name="low-latency-playback bt-sco" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-and-bt-sco-wb">
- <path name="low-latency-playback bt-sco-wb" />
- <path name="low-latency-playback" />
- </path>
-
<path name="audio-ull-playback">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="1" />
@@ -470,59 +162,10 @@
<path name="audio-ull-playback" />
</path>
- <path name="audio-ull-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback speaker-and-headphones">
- <path name="audio-ull-playback" />
- <path name="audio-ull-playback headphones" />
- </path>
-
- <path name="audio-ull-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-ull-playback bt-sco" />
- </path>
-
- <path name="audio-ull-playback speaker-and-display-port">
- <path name="audio-ull-playback display-port" />
- <path name="audio-ull-playback" />
- </path>
-
<path name="audio-ull-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
</path>
- <path name="audio-ull-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-sco">
- <path name="audio-ull-playback bt-sco" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-sco-wb">
- <path name="audio-ull-playback bt-sco-wb" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="multi-channel-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
- </path>
-
<path name="multi-channel-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -536,229 +179,33 @@
<path name="compress-offload-playback" />
</path>
- <path name="compress-offload-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="silence-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback bt-sco" />
- </path>
-
- <path name="compress-offload-playback speaker-and-display-port">
- <path name="compress-offload-playback display-port" />
- <path name="compress-offload-playback" />
- </path>
-
<path name="compress-offload-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback speaker-and-usb-headphones">
- <path name="compress-offload-playback usb-headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback speaker-and-headphones">
- <path name="compress-offload-playback headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-sco">
- <path name="compress-offload-playback bt-sco" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-sco-wb">
- <path name="compress-offload-playback bt-sco-wb" />
- <path name="compress-offload-playback" />
- </path>
-
<path name="compress-offload-playback2">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="1" />
</path>
- <path name="compress-offload-playback2 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback2 bt-sco" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-display-port">
- <path name="compress-offload-playback2 display-port" />
- <path name="compress-offload-playback2" />
- </path>
-
<path name="compress-offload-playback2 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
</path>
- <path name="compress-offload-playback2 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-usb-headphones">
- <path name="compress-offload-playback2 usb-headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-headphones">
- <path name="compress-offload-playback2 headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-sco">
- <path name="compress-offload-playback2 bt-sco" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback2 bt-sco-wb" />
- <path name="compress-offload-playback2" />
- </path>
-
<path name="compress-offload-playback3">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="compress-offload-playback3 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback3 bt-sco" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-display-port">
- <path name="compress-offload-playback3 display-port" />
- <path name="compress-offload-playback3" />
- </path>
-
<path name="compress-offload-playback3 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="compress-offload-playback3 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-usb-headphones">
- <path name="compress-offload-playback3 usb-headphones" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-headphones">
- <path name="compress-offload-playback3 headphones" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-sco">
- <path name="compress-offload-playback3 bt-sco" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback3 bt-sco-wb" />
- <path name="compress-offload-playback3" />
- </path>
-
<path name="compress-offload-playback4">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="1" />
</path>
- <path name="compress-offload-playback4 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback4 bt-sco" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-display-port">
- <path name="compress-offload-playback4 display-port" />
- <path name="compress-offload-playback4" />
- </path>
-
<path name="voice-call">
<!-- Added AFE loopback ctrl path for CS-Voice call-->
<ctl name="TERT_TDM_RX_0 Port Mixer AUX_PCM_UL_TX" value="1" />
@@ -769,381 +216,51 @@
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
</path>
- <path name="compress-offload-playback4 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-usb-headphones">
- <path name="compress-offload-playback4 usb-headphones" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-headphones">
- <path name="compress-offload-playback4 headphones" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-sco">
- <path name="compress-offload-playback4 bt-sco" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback4 bt-sco-wb" />
- <path name="compress-offload-playback4" />
- </path>
-
<path name="compress-offload-playback5">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="1" />
</path>
- <path name="compress-offload-playback5 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback5 bt-sco" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-display-port">
- <path name="compress-offload-playback5 display-port" />
- <path name="compress-offload-playback5" />
- </path>
-
<path name="compress-offload-playback5 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
</path>
- <path name="compress-offload-playback5 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-usb-headphones">
- <path name="compress-offload-playback5 usb-headphones" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-headphones">
- <path name="compress-offload-playback5 headphones" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-sco">
- <path name="compress-offload-playback5 bt-sco" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback5 bt-sco-wb" />
- <path name="compress-offload-playback5" />
- </path>
-
<path name="compress-offload-playback6">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="1" />
</path>
- <path name="compress-offload-playback6 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback6 bt-sco" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-display-port">
- <path name="compress-offload-playback6 display-port" />
- <path name="compress-offload-playback6" />
- </path>
-
<path name="compress-offload-playback6 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
</path>
- <path name="compress-offload-playback6 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-usb-headphones">
- <path name="compress-offload-playback6 usb-headphones" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-headphones">
- <path name="compress-offload-playback6 headphones" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-sco">
- <path name="compress-offload-playback6 bt-sco" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback6 bt-sco-wb" />
- <path name="compress-offload-playback6" />
- </path>
-
<path name="compress-offload-playback7">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="1" />
</path>
- <path name="compress-offload-playback7 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback7 bt-sco" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-display-port">
- <path name="compress-offload-playback7 display-port" />
- <path name="compress-offload-playback7" />
- </path>
-
<path name="compress-offload-playback7 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
</path>
- <path name="compress-offload-playback7 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-usb-headphones">
- <path name="compress-offload-playback7 usb-headphones" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-headphones">
- <path name="compress-offload-playback7 headphones" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-sco">
- <path name="compress-offload-playback7 bt-sco" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback7 bt-sco-wb" />
- <path name="compress-offload-playback7" />
- </path>
-
<path name="compress-offload-playback8">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="1" />
</path>
- <path name="compress-offload-playback8 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback8 bt-sco" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-display-port">
- <path name="compress-offload-playback8 display-port" />
- <path name="compress-offload-playback8" />
- </path>
-
<path name="compress-offload-playback8 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
</path>
- <path name="compress-offload-playback8 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-usb-headphones">
- <path name="compress-offload-playback8 usb-headphones" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-headphones">
- <path name="compress-offload-playback8 headphones" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-sco">
- <path name="compress-offload-playback8 bt-sco" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback8 bt-sco-wb" />
- <path name="compress-offload-playback8" />
- </path>
-
<path name="compress-offload-playback9">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="compress-offload-playback9 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback9 bt-sco" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-display-port">
- <path name="compress-offload-playback9 display-port" />
- <path name="compress-offload-playback9" />
- </path>
-
<path name="compress-offload-playback9 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="compress-offload-playback9 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-usb-headphones">
- <path name="compress-offload-playback9 usb-headphones" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-headphones">
- <path name="compress-offload-playback9 headphones" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-sco">
- <path name="compress-offload-playback9 bt-sco" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback9 bt-sco-wb" />
- <path name="compress-offload-playback9" />
- </path>
-
<!-- The following use cases are used for car streams -->
<path name="media-playback">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
@@ -1181,6 +298,18 @@
<ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
</path>
+ <path name="audio-record2">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="MultiMedia33 Mixer TERT_TDM_TX_0" value="1" />
+ <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
+ </path>
+
+ <path name="audio-record3">
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="MultiMedia34 Mixer TERT_TDM_TX_0" value="1" />
+ <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
+ </path>
+
<path name="front-passenger-record">
<ctl name="QUAT_TDM_TX_0 Channels" value="Eight" />
<ctl name="MultiMedia23 Mixer QUAT_TDM_TX_0" value="1" />
@@ -1191,19 +320,6 @@
<ctl name="MultiMedia22 Mixer QUAT_TDM_TX_0" value="1" />
</path>
- <path name="audio-record usb-headset-mic">
- <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record bt-sco">
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record bt-sco" />
- </path>
-
<path name="audio-record capture-fm">
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
@@ -1218,37 +334,11 @@
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="audio-record-compress bt-sco">
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-compress bt-sco" />
- </path>
-
- <path name="audio-record-compress usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
<path name="low-latency-record">
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="low-latency-record bt-sco">
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="low-latency-record bt-sco" />
- </path>
-
- <path name="low-latency-record usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
<path name="low-latency-record capture-fm">
<ctl name="TERT_TDM_TX_0 Channels" value="One" />
<ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
@@ -1259,140 +349,6 @@
<ctl name="MultiMedia2 Mixer TERT_TDM_TX_0" value="1" />
</path>
- <path name="play-fm">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
-
- <path name="play-fm headphones">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
- </path>
-
- <path name="incall-rec-uplink">
- <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
- </path>
-
- <path name="incall-rec-uplink bt-sco">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink bt-sco-wb">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink usb-headset-mic">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink afe-proxy">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink-compress">
- <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
- </path>
-
- <path name="incall-rec-uplink-compress bt-sco">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress bt-sco-wb">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress usb-headset-mic">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress afe-proxy">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-downlink">
- <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
- </path>
-
- <path name="incall-rec-downlink bt-sco">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink bt-sco-wb">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink usb-headset-mic">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink afe-proxy">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink-compress">
- <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" />
- </path>
-
- <path name="incall-rec-downlink-compress bt-sco">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress bt-sco-wb">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress usb-headset-mic">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress afe-proxy">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink">
- <path name="incall-rec-uplink" />
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink bt-sco">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink bt-sco-wb">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink afe-proxy">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress">
- <path name="incall-rec-uplink-compress" />
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress bt-sco">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress bt-sco-wb">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress afe-proxy">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
<path name="icc-call">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
@@ -1458,197 +414,17 @@
<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" />
- </path>
-
- <path name="compress-voip-call bt-a2dp">
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
-
- <path name="compress-voip-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-voip-call bt-sco" />
- </path>
-
- <path name="compress-voip-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="1" />
- </path>
-
- <path name="voicemmode1-call">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="voicemmode1-call bt-sco" />
- </path>
-
- <path name="voicemmode1-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call display-port-and-usb-headset-mic">
- <ctl name="DISPLAY_PORT_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 TERT_TDM_TX_0_MMode1" value="1" />
- </path>
-
- <path name="voicemmode2-call">
- <ctl name="TERT_TDM_RX_2_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="voicemmode2-call bt-sco" />
- </path>
-
- <path name="voicemmode2-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call display-port-and-usb-headset-mic">
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_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 TERT_TDM_TX_0_MMode2" value="1" />
- </path>
-
<!-- VoIP Rx settings -->
<path name="audio-playback-voip">
<ctl name="TERT_TDM_RX_0 Channels" value="Six" />
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="audio-playback-voip headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-playback-voip bt-sco" />
- </path>
-
<path name="audio-playback-voip afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
- <path name="audio-playback-voip usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip display-port">
- <ctl name="DISPLAY_PORT 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" />
- </path>
-
<!-- VoIP Tx settings -->
- <path name="audio-record-voip">
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record-voip usb-headset-mic">
- <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-voip bt-sco">
- <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-voip bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-voip bt-sco" />
- </path>
- <path name="spkr-rx-calib">
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
<path name="spkr-vi-record">
</path>
@@ -1732,10 +508,6 @@
<path name="sidetone-iir" />
</path>
- <path name="afe-sidetone">
- <ctl name="Voice Sidetone Enable" value="1" />
- </path>
-
<path name="speaker-mic">
<path name="dmic3" />
</path>
@@ -2190,31 +962,6 @@
<path name="tty-headphones">
</path>
- <path name="voice-tty-full-headphones">
- <ctl name="TTY Mode" value="FULL" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-vco-headphones">
- <ctl name="TTY Mode" value="VCO" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-hco-handset">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset" />
- </path>
-
- <path name="voice-tty-hco-handset-qrd">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-tty-hco-handset-hdk">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset-qrd" />
- </path>
-
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
</path>
@@ -2254,21 +1001,11 @@
<!-- USB TTY start -->
<!-- full: both end tty -->
- <path name="voice-tty-full-usb">
- <ctl name="TTY Mode" value="FULL" />
- <path name="usb-headphones" />
- </path>
<path name="voice-tty-full-usb-mic">
<path name="usb-headset-mic" />
</path>
- <!-- vco, in: handset mic use existing, out: tty -->
- <path name="voice-tty-vco-usb">
- <ctl name="TTY Mode" value="VCO" />
- <path name="usb-headphones" />
- </path>
-
<!-- hco, in: tty, out: speaker, use existing handset -->
<path name="voice-tty-hco-usb-mic">
<path name="voice-tty-full-usb-mic" />
@@ -2277,126 +1014,6 @@
<!-- USB TTY end -->
<!-- Added for ADSP testfwk -->
- <path name="ADSP testfwk">
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
-
- <path name="bt-a2dp">
- <ctl name="SLIM7_RX ADM Channels" value="Two" />
- </path>
-
- <path name="speaker-and-bt-a2dp">
- <path name="speaker" />
- <path name="bt-a2dp" />
- </path>
-
- <path name="deep-buffer-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="low-latency-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-a2dp">
- <path name="deep-buffer-playback bt-a2dp" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-a2dp">
- <path name="compress-offload-playback bt-a2dp" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="low-latency-playback speaker-and-bt-a2dp">
- <path name="low-latency-playback bt-a2dp" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-a2dp">
- <path name="compress-offload-playback2 bt-a2dp" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-a2dp">
- <path name="compress-offload-playback3 bt-a2dp" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-a2dp">
- <path name="compress-offload-playback4 bt-a2dp" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-a2dp">
- <path name="compress-offload-playback5 bt-a2dp" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-a2dp">
- <path name="compress-offload-playback6 bt-a2dp" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-a2dp">
- <path name="compress-offload-playback7 bt-a2dp" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-a2dp">
- <path name="compress-offload-playback8 bt-a2dp" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-a2dp">
- <path name="compress-offload-playback9 bt-a2dp" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-a2dp">
- <path name="audio-ull-playback bt-a2dp" />
- <path name="audio-ull-playback" />
- </path>
<path name="mmap-playback">
<ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
@@ -2422,173 +1039,12 @@
<ctl name="QUIN_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="mmap-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback speaker-and-headphones">
- <path name="mmap-playback" />
- <path name="mmap-playback headphones" />
- </path>
-
- <path name="mmap-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="16000" />
- <path name="mmap-playback bt-sco" />
- </path>
-
<path name="mmap-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
</path>
- <path name="mmap-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-buffer-playback hdmi">
- <ctl name="HDMI Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback speaker-and-hdmi">
- <path name="mmap-playback hdmi" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-and-display-port">
- <path name="mmap-playback display-port" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-and-usb-headphones">
- <path name="mmap-playback usb-headphones" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-record">
- <ctl name="MultiMedia16 Mixer TERT_TDM_TX_0" value="1" />
- </path>
-
- <path name="mmap-record bt-sco">
- <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="mmap-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="mmap-record bt-sco" />
- </path>
-
- <path name="mmap-record capture-fm">
- <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="1" />
- </path>
-
- <path name="mmap-record usb-headset-mic">
- <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="hifi-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
- </path>
-
<path name="hifi-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
- <path name="hifi-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-record usb-headset-mic">
- <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="incall_music_uplink">
- <ctl name="Incall_Music Audio Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="incall_music_uplink speaker">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink handset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink handset-hac">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink display-port">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-sco-wb">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-display-port">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink afe-proxy">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink usb-headset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink voice-tty-hco-handset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
- <path name="incall_music_uplink afe-proxy">
- <path name="incall_music_uplink" />
- </path>
-
</mixer>
diff --git a/configs/msmsteppe_au/msmsteppe_au.mk b/configs/msmsteppe_au/msmsteppe_au.mk
old mode 100644
new mode 100755
index 6efcd35..5858886
--- a/configs/msmsteppe_au/msmsteppe_au.mk
+++ b/configs/msmsteppe_au/msmsteppe_au.mk
@@ -5,7 +5,7 @@
ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS),true)
-USE_CUSTOM_AUDIO_POLICY := 1
+USE_CUSTOM_AUDIO_POLICY := 0
else
USE_CUSTOM_AUDIO_POLICY := 0
endif
@@ -38,6 +38,9 @@
AUDIO_FEATURE_ENABLED_3D_AUDIO := false
DOLBY_ENABLE := false
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
+SOONG_CONFIG_NAMESPACES += tinycompressnamespace
+SOONG_CONFIG_tinycompressnamespace := ext_compress_format_enabled
+SOONG_CONFIG_tinycompressnamespace_ext_compress_format_enabled := true
endif
USE_XML_AUDIO_POLICY_CONF := 1
@@ -364,7 +367,7 @@
vendor.audio.feature.compress_in.enable=false \
vendor.audio.feature.compress_meta_data.enable=false \
vendor.audio.feature.compr_voip.enable=false \
-vendor.audio.feature.concurrent_capture.enable=false \
+vendor.audio.feature.concurrent_capture.enable=true \
vendor.audio.feature.custom_stereo.enable=false \
vendor.audio.feature.display_port.enable=false \
vendor.audio.feature.dsm_feedback.enable=false \
@@ -400,7 +403,8 @@
vendor.audio.feature.snd_mon.enable=false \
vendor.audio.feature.auto_hal.enable=true \
vendor.audio.feature.synth.enable=true \
-vendor.audio.feature.powerpolicy.enable=true
+vendor.audio.feature.powerpolicy.enable=true \
+vendor.audio.feature.concurrent_pcm_record.enable=true
else
# Non-Generic ODM varient related
PRODUCT_ODM_PROPERTIES += \
@@ -412,7 +416,7 @@
vendor.audio.feature.compress_in.enable=true \
vendor.audio.feature.compress_meta_data.enable=true \
vendor.audio.feature.compr_voip.enable=false \
-vendor.audio.feature.concurrent_capture.enable=false \
+vendor.audio.feature.concurrent_capture.enable=true \
vendor.audio.feature.custom_stereo.enable=true \
vendor.audio.feature.display_port.enable=true \
vendor.audio.feature.dsm_feedback.enable=false \
@@ -448,7 +452,8 @@
vendor.audio.feature.snd_mon.enable=false \
vendor.audio.feature.auto_hal.enable=true \
vendor.audio.feature.synth.enable=true \
-vendor.audio.feature.powerpolicy.enable=true
+vendor.audio.feature.powerpolicy.enable=true \
+vendor.audio.feature.concurrent_pcm_record.enable=true
endif
# for HIDL related packages
@@ -493,7 +498,7 @@
AudioSettings
# for HIDL related audiocontrol packages
-ifneq ($(PLATFORM_VERSION), 12)
+ifeq ( ,$(filter 12 Tiramisu,$(PLATFORM_VERSION)))
PRODUCT_PACKAGES += \
android.hardware.automotive.audiocontrol@2.0-service \
android.hardware.automotive.audiocontrol@2.0
diff --git a/configs/sdm660/audio_policy_configuration.xml b/configs/sdm660/audio_policy_configuration.xml
index 0a7eec4..5a25dad 100644
--- a/configs/sdm660/audio_policy_configuration.xml
+++ b/configs/sdm660/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -210,7 +246,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/sdm710/audio_policy_configuration.xml b/configs/sdm710/audio_policy_configuration.xml
index 2fe49a3..89ed904 100644
--- a/configs/sdm710/audio_policy_configuration.xml
+++ b/configs/sdm710/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -218,7 +254,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/sdm845/audio_policy_configuration.xml b/configs/sdm845/audio_policy_configuration.xml
index f05d636..af9229f 100644
--- a/configs/sdm845/audio_policy_configuration.xml
+++ b/configs/sdm845/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -213,7 +249,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configs/trinket/audio_policy_configuration.xml b/configs/trinket/audio_policy_configuration.xml
index b7775ef..4855cd9 100755
--- a/configs/trinket/audio_policy_configuration.xml
+++ b/configs/trinket/audio_policy_configuration.xml
@@ -17,6 +17,42 @@
limitations under the License.
-->
+<!--
+Changes from Qualcomm Innovation Center are provided under the following license:
+
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
@@ -220,7 +256,7 @@
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</devicePort>
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/configure.ac b/configure.ac
index 997c53d..d2692c7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -50,10 +50,20 @@
[sa81*], [TARGET_SUPPORT=msmnile_au],
[sa61*], [TARGET_SUPPORT=msmsteppe_au],
[qrbx210], [TARGET_SUPPORT=qrbx210],
+ [qrb5165], [TARGET_SUPPORT=qrb5165],
+ [sdmsteppe], [TARGET_SUPPORT=sdmsteppe],
[TARGET_SUPPORT=none])],
[TARGET_SUPPORT=none]
)
+AC_ARG_WITH(hal-path,
+ AS_HELP_STRING([--with-hal-path=DIR], [Specify the HAL modules location in run time]),
+ [HAL_PATH="$withval"],
+ [HAL_PATH="no"])
+
+AM_CONDITIONAL([HAL_PATH_SPECIFIED], [test "x${HAL_PATH}" != "xno"])
+AC_SUBST(HAL_PATH)
+
if (test "x${with_glib}" = "xyes"); then
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,
AC_MSG_ERROR(GThread >= 2.16 is required))
@@ -104,6 +114,8 @@
if (test x$TARGET_SUPPORT = xsdmsteppe); then
AC_SUBST([TARGET_PLATFORM], ["msm8974"])
TARGET_CFLAGS="-DPLATFORM_MSMSTEPPE"
+ TARGET_CFLAGS+=" -DMAX_TARGET_SPECIFIC_CHANNEL_CNT=\"4\""
+ TARGET_CFLAGS+=" -DINCALL_STEREO_CAPTURE_ENABLED"
fi
if (test x$TARGET_SUPPORT = xqrbx210); then
AC_SUBST([TARGET_PLATFORM], ["msm8974"])
@@ -111,6 +123,12 @@
TARGET_CFLAGS+=" -DMAX_TARGET_SPECIFIC_CHANNEL_CNT=\"4\""
TARGET_CFLAGS+=" -DINCALL_STEREO_CAPTURE_ENABLED"
fi
+if (test x$TARGET_SUPPORT = xqrb5165); then
+ AC_SUBST([TARGET_PLATFORM], ["msm8974"])
+ TARGET_CFLAGS=" -DPLATFORM_KONA"
+ TARGET_CFLAGS+=" -DMAX_TARGET_SPECIFIC_CHANNEL_CNT=\"4\""
+ TARGET_CFLAGS+=" -DINCALL_STEREO_CAPTURE_ENABLED"
+fi
if (test x$TARGET_SUPPORT = xmsmnile_au); then
AC_SUBST([TARGET_PLATFORM], ["msm8974"])
TARGET_CFLAGS="-DPLATFORM_MSMNILE"
@@ -119,6 +137,8 @@
AC_SUBST([TARGET_PLATFORM], ["msm8974"])
TARGET_CFLAGS="-DPLATFORM_MSMSTEPPE"
fi
+
+TARGET_CFLAGS+=' -DLE_LIBDIR=\"${libdir}\" '
AC_SUBST([TARGET_CFLAGS])
AM_CONDITIONAL([QTI_AUDIO_SERVER_ENABLED],[test x$BOARD_SUPPORTS_QTI_AUDIO_SERVER = xtrue])
diff --git a/hal/Android.mk b/hal/Android.mk
old mode 100644
new mode 100755
index c9400b6..9842cc2
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -138,6 +138,10 @@
LOCAL_HEADER_LIBRARIES := libhardware_headers
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_SRC_FILES := \
audio_hw.c \
acdb.c \
@@ -253,6 +257,16 @@
LOCAL_SRC_FILES += audio_extn/qaf.c
endif
+# Concurrent capture
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE)),true)
+ LOCAL_CFLAGS += -DCONCURRENT_CAPTURE_ENABLED
+endif
+
+# soft step volume params control
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SOFT_VOLUME)),true)
+ LOCAL_CFLAGS += -DSOFT_VOLUME
+endif
+
# Hardware specific feature
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_QAP)),true)
LOCAL_CFLAGS += -DQAP_EXTN_ENABLED -Wno-tautological-pointer-compare
diff --git a/hal/Makefile.am b/hal/Makefile.am
index f14ab4c..79b5dea 100755
--- a/hal/Makefile.am
+++ b/hal/Makefile.am
@@ -192,6 +192,9 @@
AM_CFLAGS += -DAUDIO_DISABLE_COMPRESS_FORMAT
endif
+if HAL_PATH_SPECIFIED
+AM_CFLAGS += -DHAL_LIBRARY_PATH=\"@HAL_PATH@\"
+endif
h_sources = audio_extn/audio_defs.h \
audio_extn/audio_extn.h \
audio_hw.h \
@@ -209,6 +212,9 @@
audio_primary_default_la_LIBADD += -laudioparsers
endif
audio_primary_default_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
+if HAL_PATH_SPECIFIED
+audio_primary_default_la_CFLAGS += -DHAL_LIBRARY_PATH=\"@HAL_PATH@\"
+endif
audio_primary_default_la_CFLAGS += -Dstrlcat=g_strlcat
audio_primary_default_la_CFLAGS += -DINT_MAX=0x7fffffff -Wno-error=deprecated-declarations -DPATH_MAX=1024 -DULONG_MAX=0xFFFFFFFFFFFFFFFFUL
audio_primary_default_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)
diff --git a/hal/acdb.c b/hal/acdb.c
index f4cebec..8dfcc2c 100644
--- a/hal/acdb.c
+++ b/hal/acdb.c
@@ -170,7 +170,13 @@
ctl = mixer_get_ctl_by_name(mixer, CVD_VERSION_MIXER_CTL);
if (!ctl) {
ALOGE("%s: Could not get ctl for mixer cmd - %s", __func__, CVD_VERSION_MIXER_CTL);
+#ifdef PLATFORM_AUTO
+ ALOGE("%s: Ctl check bypassed in automotive platform for mixer cmd - %s",
+ __func__, CVD_VERSION_MIXER_CTL);
+ goto get_sound_card_name;
+#else
goto cleanup;
+#endif
}
mixer_ctl_update(ctl);
@@ -185,6 +191,9 @@
}
}
+#ifdef PLATFORM_AUTO
+get_sound_card_name:
+#endif
/* Get Sound card name */
snd_card_name = mixer_get_name(mixer);
snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);
diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index 3a6f2bb..a7f18bd 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -51,6 +51,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -264,6 +269,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -338,6 +348,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
@@ -408,6 +423,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -465,6 +485,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -538,6 +563,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -604,6 +634,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -676,6 +711,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -742,6 +782,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -809,6 +854,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -1016,6 +1066,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -1077,6 +1132,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -1139,6 +1199,11 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
+
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
diff --git a/hal/audio_extn/Makefile.am b/hal/audio_extn/Makefile.am
index b8068b0..5f55dc6 100755
--- a/hal/audio_extn/Makefile.am
+++ b/hal/audio_extn/Makefile.am
@@ -221,6 +221,10 @@
libhfp_la_LIBADD += -ltinycompress -laudioroute -ldl -lexpat -laudioutils
libhfp_la_LIBADD += -lm -lc -lresolv
+if AUDIO_PARSER
+libhfp_la_LIBADD += -laudioparsers
+endif
+
libhfp_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
libhfp_la_CFLAGS += -Dstrlcat=g_strlcat
libhfp_la_CFLAGS += -DINT_MAX=0x7fffffff
@@ -230,5 +234,30 @@
libhfp_la_CFLAGS += -DLINUX_ENABLED $(TARGET_CFLAGS) -DAUDIO_EXTN_FORMATS_ENABLED
libhfp_la_CFLAGS += -DNDEBUG
libhfp_la_CFLAGS += -D_GNU_SOURCE
+if HAL_PATH_SPECIFIED
+libhfp_la_CFLAGS += -DHAL_LIBRARY_PATH=\"@HAL_PATH@\"
+endif
libhfp_la_LDFLAGS = -module -shared -avoid-version
endif
+
+if SPKR_PROTECTION
+h_sources = audio_defs.h \
+ audio_extn.h \
+ ../audio_hw.h \
+ ../voice.h
+
+AM_CFLAGS += -DSPKR_PROT_ENABLED
+library_include_HEADERS = $(h_sources)
+library_includedir = $(includedir)
+lib_LTLIBRARIES += audio.spkr.prot.la
+audio_spkr_prot_la_SOURCES = spkr_protection.c
+audio_spkr_prot_la_LIBADD = $(GLIB_LIBS) -llog -lcutils -ltinyalsa
+audio_spkr_prot_la_LIBADD += -ltinycompress -laudioroute -ldl -lexpat -laudioutils
+audio_spkr_prot_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
+audio_spkr_prot_la_CFLAGS += -Dstrlcat=g_strlcat
+audio_spkr_prot_la_CFLAGS += -DINT_MAX=0x7fffffff
+audio_spkr_prot_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)
+audio_spkr_prot_la_CFLAGS += -DLINUX_ENABLED $(TARGET_CFLAGS) -DAUDIO_EXTN_FORMATS_ENABLED
+audio_spkr_prot_la_CFLAGS += -DNDEBUG
+audio_spkr_prot_la_LDFLAGS = -module -shared -avoid-version
+endif
diff --git a/hal/audio_extn/PowerPolicyClient.cpp b/hal/audio_extn/PowerPolicyClient.cpp
index e3a9e22..62dcf39 100644
--- a/hal/audio_extn/PowerPolicyClient.cpp
+++ b/hal/audio_extn/PowerPolicyClient.cpp
@@ -51,7 +51,11 @@
} // namespace
-PowerPolicyClient::PowerPolicyClient() {
+PowerPolicyClient::PowerPolicyClient(power_policy_init_config_t init_config) {
+
+ fp_in_set_power_policy = init_config.fp_in_set_power_policy;
+ fp_out_set_power_policy = init_config.fp_out_set_power_policy;
+
plugin_handle = dlopen(LIB_AUDIO_HAL_PLUGIN, RTLD_NOW);
if (plugin_handle == NULL) {
LOG(ERROR) << "Failed to open plugin library";
@@ -89,12 +93,16 @@
if (hasComponent(powerPolicy.enabledComponents, kAudioComponent)) {
LOG(ERROR) << "Power policy: Audio component is enabled";
disable = 0;
+
+ fp_out_set_power_policy(!disable);
if (hal_plugin_send_msg != NULL)
hal_plugin_send_msg(AUDIO_HAL_PLUGIN_MSG_SILENT_MODE,
&disable, sizeof(disable));
} else if (hasComponent(powerPolicy.disabledComponents, kAudioComponent)) {
LOG(ERROR) << "Power policy: Audio component is disabled";
disable = 1;
+
+ fp_out_set_power_policy(!disable);
if (hal_plugin_send_msg != NULL)
hal_plugin_send_msg(AUDIO_HAL_PLUGIN_MSG_SILENT_MODE,
&disable, sizeof(disable));
@@ -103,11 +111,15 @@
if (hasComponent(powerPolicy.enabledComponents, kMicComponent)) {
LOG(ERROR) << "Power policy: Microphone component is enabled";
disable = 0;
+
+ fp_in_set_power_policy(!disable);
if (hal_plugin_send_msg != NULL)
hal_plugin_send_msg(AUDIO_HAL_PLUGIN_MSG_MIC_STATE,
&disable, sizeof(disable));
} else if (hasComponent(powerPolicy.disabledComponents, kMicComponent)) {
disable = 1;
+
+ fp_in_set_power_policy(!disable);
if (hal_plugin_send_msg != NULL)
hal_plugin_send_msg(AUDIO_HAL_PLUGIN_MSG_MIC_STATE,
&disable, sizeof(disable));
diff --git a/hal/audio_extn/PowerPolicyClient.h b/hal/audio_extn/PowerPolicyClient.h
index da0b434..c5308e3 100644
--- a/hal/audio_extn/PowerPolicyClient.h
+++ b/hal/audio_extn/PowerPolicyClient.h
@@ -32,11 +32,19 @@
#include "audio_hal_plugin.h"
typedef int32_t (*hal_plugin_send_msg_t) (audio_hal_plugin_msg_type_t, void*, uint32_t);
+typedef void (*fp_in_set_power_policy_t) (uint8_t);
+typedef void (*fp_out_set_power_policy_t) (uint8_t);
+
+typedef struct power_policy_init_config {
+ fp_in_set_power_policy_t fp_in_set_power_policy;
+ fp_out_set_power_policy_t fp_out_set_power_policy;
+} power_policy_init_config_t;
+
class PowerPolicyClient
: public ::android::frameworks::automotive::powerpolicy::PowerPolicyClientBase {
public:
- explicit PowerPolicyClient();
+ explicit PowerPolicyClient(power_policy_init_config init_config);
~PowerPolicyClient();
void onInitFailed();
@@ -48,6 +56,8 @@
private:
void* plugin_handle;
hal_plugin_send_msg_t hal_plugin_send_msg;
+ fp_out_set_power_policy_t fp_out_set_power_policy;
+ fp_in_set_power_policy_t fp_in_set_power_policy;
};
#endif // QTI_AUDIO_POWERPOLICYCLIENT_H_
diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
old mode 100755
new mode 100644
index d93bd70..3edc7f5
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -35,6 +35,42 @@
* limitations under the License.
*/
+/*
+* Changes from Qualcomm Innovation Center are provided under the following license:
+*
+* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted (subject to the limitations in the
+* disclaimer below) provided that the following conditions are met:
+*
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+*
+* * Redistributions in binary form must reproduce the above
+* copyright notice, this list of conditions and the following
+* disclaimer in the documentation and/or other materials provided
+* with the distribution.
+*
+* * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+* contributors may be used to endorse or promote products derived
+* from this software without specific prior written permission.
+*
+* NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+* GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
#define LOG_TAG "audio_hw_extn"
/*#define LOG_NDEBUG 0*/
#define LOG_NDDEBUG 0
@@ -203,6 +239,7 @@
static bool audio_extn_maxx_audio_enabled = false;
static bool audio_extn_audiozoom_enabled = false;
static bool audio_extn_hifi_filter_enabled = false;
+static bool audio_extn_concurrent_pcm_record_enabled = false;
#define AUDIO_PARAMETER_KEY_AANC_NOISE_LEVEL "aanc_noise_level"
#define AUDIO_PARAMETER_KEY_ANC "anc_enabled"
@@ -1798,6 +1835,23 @@
#define CIRRUS_SPKR_PROT_LIB_PATH "/vendor/lib/libcirrusspkrprot.so"
#endif
+
+#define STR_CAT(path, extn) (path extn)
+
+#if LINUX_ENABLED
+# define SPKR_PROT_LIB_PATH STR_CAT(LE_LIBDIR, "/audio.spkr.prot.so")
+# define CIRRUS_SPKR_PROT_LIB_PATH STR_CAT(LE_LIBDIR, "/audio.external.spkr.prot.so")
+#else
+# ifdef __LP64__
+# define SPKR_PROT_LIB_PATH "/vendor/lib64/libspkrprot.so"
+# define CIRRUS_SPKR_PROT_LIB_PATH "/vendor/lib64/libcirrusspkrprot.so"
+# else
+# define SPKR_PROT_LIB_PATH "/vendor/lib/libspkrprot.so"
+# define CIRRUS_SPKR_PROT_LIB_PATH "/vendor/lib/libcirrusspkrprot.so"
+# endif
+#endif
+
+
static void *spkr_prot_lib_handle = NULL;
typedef void (*spkr_prot_init_t)(void *, spkr_prot_init_config_t);
@@ -1838,10 +1892,14 @@
is_feature_enabled ? "Enabled" : "NOT Enabled", vendor_enhanced_info);
if (is_feature_enabled) {
// dlopen lib
+#if LINUX_ENABLED
+ spkr_prot_lib_handle = dlopen(SPKR_PROT_LIB_PATH, RTLD_NOW);
+#else
if ((vendor_enhanced_info & 0x3) == 0x0) // Pure AOSP
spkr_prot_lib_handle = dlopen(CIRRUS_SPKR_PROT_LIB_PATH, RTLD_NOW);
else
spkr_prot_lib_handle = dlopen(SPKR_PROT_LIB_PATH, RTLD_NOW);
+#endif
if (spkr_prot_lib_handle == NULL) {
ALOGE("%s: dlopen failed", __func__);
@@ -4878,14 +4936,24 @@
#ifdef __LP64__
#ifdef LINUX_ENABLED
#define HFP_LIB_PATH "/usr/lib64/libhfp.so"
+#define LINUX_PATH true
+#ifdef HAL_LIBRARY_PATH
+#define HFP_LIB_PATH HAL_LIBRARY_PATH
+#endif
#else
#define HFP_LIB_PATH "/vendor/lib64/libhfp.so"
+#define LINUX_PATH false
#endif
#else
#ifdef LINUX_ENABLED
#define HFP_LIB_PATH "/usr/lib/libhfp.so"
+#define LINUX_PATH true
+#ifdef HAL_LIBRARY_PATH
+#define HFP_LIB_PATH HAL_LIBRARY_PATH
+#endif
#else
#define HFP_LIB_PATH "/vendor/lib/libhfp.so"
+#define LINUX_PATH false
#endif
#endif
@@ -4916,8 +4984,12 @@
is_feature_enabled ? "Enabled" : "NOT Enabled");
if (is_feature_enabled) {
// dlopen lib
- hfp_lib_handle = dlopen(HFP_LIB_PATH, RTLD_NOW);
-
+ if (LINUX_PATH) {
+ char libhfp_path[100];
+ snprintf(libhfp_path, sizeof(libhfp_path), "%s/libhfp.so", HFP_LIB_PATH);
+ hfp_lib_handle = dlopen(libhfp_path, RTLD_NOW);
+ } else
+ hfp_lib_handle = dlopen(HFP_LIB_PATH , RTLD_NOW);
if (!hfp_lib_handle) {
ALOGE("%s: dlopen failed", __func__);
goto feature_disabled;
@@ -5626,6 +5698,19 @@
}
// END: CONCURRENT_CAPTURE ====================================================
+// START: CONCURRENT_PCM_RECORD ===============================================
+bool audio_extn_is_concurrent_pcm_record_enabled()
+{
+ return audio_extn_concurrent_pcm_record_enabled;
+}
+
+void concurrent_pcm_record_feature_init(bool is_feature_enabled)
+{
+ audio_extn_concurrent_pcm_record_enabled = is_feature_enabled;
+ ALOGD("%s: ---- Feature CONCURRENT_PCM_RECORD is %s----", __func__, is_feature_enabled? "ENABLED": "NOT ENABLED");
+}
+// END: CONCURRENT_PCM_RECORD =================================================
+
// START: COMPRESS_IN ==================================================
void compress_in_feature_init(bool is_feature_enabled)
{
@@ -6513,10 +6598,13 @@
goto exit;
}
ALOGD("%s: Launching Power Policy Client", __func__);
- launch_power_policy();
+ power_policy_init_config_t init_config;
+ init_config.fp_in_set_power_policy = in_set_power_policy;
+ init_config.fp_out_set_power_policy = out_set_power_policy;
+ launch_power_policy(init_config);
exit:
- pthread_exit(NULL);
+ return NULL;
}
static int power_policy_feature_init(bool is_feature_enabled)
@@ -6699,6 +6787,9 @@
power_policy_feature_init(
property_get_bool("vendor.audio.feature.powerpolicy.enable",
false));
+ concurrent_pcm_record_feature_init(
+ property_get_bool("vendor.audio.feature.concurrent_pcm_record.enable",
+ false));
}
void audio_extn_set_parameters(struct audio_device *adev,
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
old mode 100755
new mode 100644
index 85502ad..f2038d8
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -1428,6 +1428,17 @@
} synth_init_config_t;
// END: SYNTH_HAL FEATURE ==================================================
+// START: POWER_POLICY FEATURE ==================================================
+
+typedef void (*fp_in_set_power_policy_t) (uint8_t);
+typedef void (*fp_out_set_power_policy_t) (uint8_t);
+
+typedef struct power_policy_init_config {
+ fp_in_set_power_policy_t fp_in_set_power_policy;
+ fp_out_set_power_policy_t fp_out_set_power_policy;
+} power_policy_init_config_t;
+// END: POWER_POLICY FEATURE ==================================================
+
bool audio_extn_edid_is_supported_sr(edid_audio_info* info, int sr);
bool audio_extn_edid_is_supported_bps(edid_audio_info* info, int bps);
int audio_extn_edid_get_highest_supported_sr(edid_audio_info* info);
@@ -1458,4 +1469,5 @@
int channel_count);
void audio_get_vendor_config_path(char* config_file_path, int path_size);
+bool audio_extn_is_concurrent_pcm_record_enabled();
#endif /* AUDIO_EXTN_H */
diff --git a/hal/audio_extn/auto_hal.c b/hal/audio_extn/auto_hal.c
old mode 100755
new mode 100644
index 977147c..6ee6859
--- a/hal/audio_extn/auto_hal.c
+++ b/hal/audio_extn/auto_hal.c
@@ -380,7 +380,26 @@
case CAR_AUDIO_STREAM_SYS_NOTIFICATION:
/* sys notification bus stream shares pcm device with low-latency */
out->usecase = USECASE_AUDIO_PLAYBACK_SYS_NOTIFICATION;
- out->config = pcm_config_system;
+ switch(out->sample_rate)
+ {
+ case 48000:
+ out->config=pcm_config_system_48KHz;
+ break;
+ case 32000:
+ out->config=pcm_config_system_32KHz;
+ break;
+ case 24000:
+ out->config=pcm_config_system_24KHz;
+ break;
+ case 16000:
+ out->config=pcm_config_system_16KHz;
+ break;
+ case 8000:
+ out->config=pcm_config_system_8KHz;
+ break;
+ default:
+ out->config=pcm_config_system_48KHz;
+ }
if (out->flags == AUDIO_OUTPUT_FLAG_NONE)
out->flags |= AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION;
out->volume_l = out->volume_r = MAX_VOLUME_GAIN;
@@ -401,7 +420,26 @@
break;
case CAR_AUDIO_STREAM_PHONE:
out->usecase = USECASE_AUDIO_PLAYBACK_PHONE;
- out->config = pcm_config_system;
+ switch(out->sample_rate)
+ {
+ case 48000:
+ out->config=pcm_config_system_48KHz;
+ break;
+ case 32000:
+ out->config=pcm_config_system_32KHz;
+ break;
+ case 24000:
+ out->config=pcm_config_system_24KHz;
+ break;
+ case 16000:
+ out->config=pcm_config_system_16KHz;
+ break;
+ case 8000:
+ out->config=pcm_config_system_8KHz;
+ break;
+ default:
+ out->config=pcm_config_system_48KHz;
+ }
if (out->flags == AUDIO_OUTPUT_FLAG_NONE)
out->flags |= AUDIO_OUTPUT_FLAG_PHONE;
out->volume_l = out->volume_r = MAX_VOLUME_GAIN;
diff --git a/hal/audio_extn/auto_hal.h b/hal/audio_extn/auto_hal.h
index c1b3250..374e2ec 100644
--- a/hal/audio_extn/auto_hal.h
+++ b/hal/audio_extn/auto_hal.h
@@ -59,6 +59,57 @@
.avail_min = LOW_LATENCY_OUTPUT_PERIOD_SIZE / 4,
};
+struct pcm_config pcm_config_system_48KHz = {
+ .channels = 2,
+ .rate = 48000,
+ .period_size = 240,
+ .period_count = LOW_LATENCY_OUTPUT_PERIOD_COUNT,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 240 / 4,
+ .stop_threshold = INT_MAX,
+ .avail_min = 240 / 4,
+};
+struct pcm_config pcm_config_system_32KHz = {
+ .channels = 2,
+ .rate = 32000,
+ .period_size = 160,
+ .period_count = LOW_LATENCY_OUTPUT_PERIOD_COUNT,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 160 / 4,
+ .stop_threshold = INT_MAX,
+ .avail_min = 160 / 4,
+};
+struct pcm_config pcm_config_system_24KHz = {
+ .channels = 2,
+ .rate = 24000,
+ .period_size = 120,
+ .period_count = LOW_LATENCY_OUTPUT_PERIOD_COUNT,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 120 / 4,
+ .stop_threshold = INT_MAX,
+ .avail_min = 120 / 4,
+};
+struct pcm_config pcm_config_system_16KHz = {
+ .channels = 2,
+ .rate = 16000,
+ .period_size = 80,
+ .period_count = LOW_LATENCY_OUTPUT_PERIOD_COUNT,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 80 / 4,
+ .stop_threshold = INT_MAX,
+ .avail_min = 80 / 4,
+};
+struct pcm_config pcm_config_system_8KHz = {
+ .channels = 2,
+ .rate = 8000,
+ .period_size = 40,
+ .period_count = LOW_LATENCY_OUTPUT_PERIOD_COUNT,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 40 / 4,
+ .stop_threshold = INT_MAX,
+ .avail_min = 40 / 4,
+};
+
static const audio_usecase_t bus_device_usecases[] = {
USECASE_AUDIO_PLAYBACK_MEDIA,
USECASE_AUDIO_PLAYBACK_SYS_NOTIFICATION,
diff --git a/hal/audio_extn/compress_in.c b/hal/audio_extn/compress_in.c
index 8795d52..864de95 100644
--- a/hal/audio_extn/compress_in.c
+++ b/hal/audio_extn/compress_in.c
@@ -58,9 +58,6 @@
/* default timestamp metadata definition if not defined in kernel*/
#ifndef COMPRESSED_TIMESTAMP_FLAG
#define COMPRESSED_TIMESTAMP_FLAG 0
-struct snd_codec_metadata {
-uint64_t timestamp;
-};
#define compress_config_set_timstamp_flag(config) (-ENOSYS)
#else
#ifdef AUDIO_GKI_ENABLED
diff --git a/hal/audio_extn/keep_alive.c b/hal/audio_extn/keep_alive.c
index 2948402..386bfc1 100644
--- a/hal/audio_extn/keep_alive.c
+++ b/hal/audio_extn/keep_alive.c
@@ -236,6 +236,7 @@
}
exit:
+ clear_devices(&out_devices);
pthread_mutex_unlock(&ka.lock);
}
diff --git a/hal/audio_extn/power_policy_launcher.cpp b/hal/audio_extn/power_policy_launcher.cpp
index a85f30c..ac846cd 100644
--- a/hal/audio_extn/power_policy_launcher.cpp
+++ b/hal/audio_extn/power_policy_launcher.cpp
@@ -34,11 +34,11 @@
extern "C" {
- int launchPowerPolicyClient() {
+ int launchPowerPolicyClient(power_policy_init_config_t init_config) {
ALOGD("%s: power policy launcher called", __func__);
ABinderProcess_setThreadPoolMaxThreadCount(0);
std::shared_ptr<PowerPolicyClient> powerPolicyClient =
- ::ndk::SharedRefBase::make<PowerPolicyClient>();
+ ::ndk::SharedRefBase::make<PowerPolicyClient>(init_config);
ALOGD("%s:Instantiating power policy client from launcher", __func__);
powerPolicyClient->init();
ALOGD("%s: Power Policy class inited, joining threadpool", __func__);
diff --git a/hal/audio_extn/soundtrigger.c b/hal/audio_extn/soundtrigger.c
index d7c4b03..5d573d0 100644
--- a/hal/audio_extn/soundtrigger.c
+++ b/hal/audio_extn/soundtrigger.c
@@ -587,6 +587,7 @@
__func__, event, snd_device);
}
}/*Events for output device, if required can be placed here in else*/
+ clear_devices(&ev_info.device_info.devices);
}
void audio_extn_sound_trigger_update_stream_status(struct audio_usecase *uc_info,
@@ -645,6 +646,7 @@
}
}
}
+ clear_devices(&ev_info.device_info.devices);
}
void audio_extn_sound_trigger_update_battery_status(bool charging)
@@ -874,6 +876,7 @@
if (st_dev && (st_dev->adev == adev) && st_dev->lib_handle) {
audio_extn_snd_mon_unregister_listener(st_dev);
dlclose(st_dev->lib_handle);
+ clear_devices(&st_dev->st_ses_list);
free(st_dev);
st_dev = NULL;
}
diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index 1badc1b..418707b 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -27,6 +27,42 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+* Changes from Qualcomm Innovation Center are provided under the following license:
+*
+* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted (subject to the limitations in the
+* disclaimer below) provided that the following conditions are met:
+*
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+*
+* * Redistributions in binary form must reproduce the above
+* copyright notice, this list of conditions and the following
+* disclaimer in the documentation and/or other materials provided
+* with the distribution.
+*
+* * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+* contributors may be used to endorse or promote products derived
+* from this software without specific prior written permission.
+*
+* NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+* GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
#define LOG_TAG "audio_hw_spkr_prot"
/*#define LOG_NDEBUG 0*/
#define LOG_NDDEBUG 0
@@ -592,6 +628,7 @@
mixer_ctl_name = SPKR_RIGHT_WSA_TEMP;
ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
+
if (!ctl) {
ALOGE("%s: Could not get ctl for mixer cmd - %s",
__func__, mixer_ctl_name);
@@ -1320,6 +1357,12 @@
thermal_fd = -1;
ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
+
+ if (!ctl) {
+ mixer_ctl_name = "SpkrMono WSA T0 Init";
+ ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
+ }
+
if (ctl) {
ALOGD("%s: Got ctl for mixer cmd %s",
__func__, mixer_ctl_name);
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
old mode 100755
new mode 100644
index 756faf5..9a4a848
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -111,6 +111,11 @@
#define VNDK_FWK_LIB_PATH "/vendor/lib/libqti_vndfwk_detect.so"
#endif
+/* 24 KHz ECNR support */
+#define ECNS_USE_CASE_ACDB_DEV_ID 95
+#define ECNS_UNSUPPORTED_CAPTURE_SAMPLE_RATE_FOR_ADM 24000
+#define ECNS_SUPPORTED_CAPTURE_SAMPLE_RATE_FOR_ADM 48000
+
typedef struct vndkfwk_s {
void *lib_handle;
int (*isVendorEnhancedFwk)(void);
@@ -750,6 +755,12 @@
app_type_cfg->app_type = platform_get_default_app_type_v2(platform, PCM_CAPTURE);
app_type_cfg->sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
app_type_cfg->bit_width = 16;
+ if ((flags & AUDIO_INPUT_FLAG_TIMESTAMP) == 0 &&
+ (flags & AUDIO_INPUT_FLAG_COMPRESS) == 0 &&
+ (flags & AUDIO_INPUT_FLAG_FAST) != 0) {
+ // Support low latency record for different sample rates
+ app_type_cfg->sample_rate = sample_rate;
+ }
}
void audio_extn_utils_update_stream_output_app_type_cfg(void *platform,
@@ -838,6 +849,11 @@
app_type_cfg->app_type = platform_get_default_app_type(platform);
app_type_cfg->sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
app_type_cfg->bit_width = 16;
+ if (compare_device_type(devices, AUDIO_DEVICE_OUT_BUS) && (flags &
+ (audio_output_flags_t)AUDIO_OUTPUT_FLAG_FAST)) {
+ // Support low latency playback for different sample rates
+ app_type_cfg->sample_rate = sample_rate;
+ }
}
static bool audio_is_this_native_usecase(struct audio_usecase *uc)
@@ -1304,6 +1320,7 @@
{
char value[PROPERTY_VALUE_MAX] = {0};
int sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+ int acdb_dev_id;
if ((usecase->type == PCM_PLAYBACK) && (usecase->stream.out != NULL)) {
property_get("vendor.audio.playback.mch.downsample",value,"");
@@ -1342,8 +1359,12 @@
usecase->stream.out->sample_rate == OUTPUT_SAMPLING_RATE_44100) ||
(usecase->stream.out->sample_rate < OUTPUT_SAMPLING_RATE_44100)) ||
(compare_device_type(&usecase->stream.out->device_list,AUDIO_DEVICE_OUT_SPEAKER))) {
- /* Reset to default if no native stream is active or default device is speaker*/
- usecase->stream.out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+ if (!((compare_device_type(&usecase->device_list, AUDIO_DEVICE_OUT_BUS)) && ((usecase->stream.out->flags &
+ (audio_output_flags_t)AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION) || (usecase->stream.out->flags &
+ (audio_output_flags_t)AUDIO_OUTPUT_FLAG_PHONE)))) {
+ /* Reset to default if no native stream is active or default device is speaker*/
+ usecase->stream.out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+ }
}
audio_extn_btsco_get_sample_rate(snd_device, &usecase->stream.out->app_type_cfg.sample_rate);
sample_rate = usecase->stream.out->app_type_cfg.sample_rate;
@@ -1378,6 +1399,15 @@
else
sample_rate = SAMPLE_RATE_8000;
}
+
+ /* ECNR module in DSP does not support 24 KHz sample rate. As a workaround,
+ run ADM at 48 KHz when ECNR is enabled in ACDB topology (e.g. device id = 95)
+ */
+ acdb_dev_id = platform_get_snd_device_acdb_id(snd_device);
+ if (sample_rate == ECNS_UNSUPPORTED_CAPTURE_SAMPLE_RATE_FOR_ADM && acdb_dev_id == ECNS_USE_CASE_ACDB_DEV_ID) {
+ sample_rate = ECNS_SUPPORTED_CAPTURE_SAMPLE_RATE_FOR_ADM;
+ ALOGD("%s: update sample rate from 24K to 48K to support ECNR in PCM_CAPTURE, sample_rate=%d",__func__,sample_rate);
+ }
} else if (usecase->type == TRANSCODE_LOOPBACK_RX) {
sample_rate = usecase->stream.inout->out_config.sample_rate;
}
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 33b0f97..752ceec 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -316,6 +316,67 @@
.avail_min = ULL_PERIOD_SIZE, //1 ms
};
+struct pcm_config pcm_config_audio_capture_rt_48KHz = {
+ .channels = 2,
+ .rate = 48000,
+ .period_size = 48,
+ .period_count = 512,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 0,
+ .stop_threshold = AFE_PROXY_RECORD_PERIOD_SIZE * AFE_PROXY_RECORD_PERIOD_COUNT,
+ .silence_threshold = 0,
+ .silence_size = 0,
+ .avail_min = 48, //1 ms
+};
+struct pcm_config pcm_config_audio_capture_rt_32KHz = {
+ .channels = 2,
+ .rate = 32000,
+ .period_size = 32,
+ .period_count = 512,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 0,
+ .stop_threshold = AFE_PROXY_RECORD_PERIOD_SIZE * AFE_PROXY_RECORD_PERIOD_COUNT,
+ .silence_threshold = 0,
+ .silence_size = 0,
+ .avail_min = 32, //1 ms
+};
+struct pcm_config pcm_config_audio_capture_rt_24KHz = {
+ .channels = 2,
+ .rate = 24000,
+ .period_size = 24,
+ .period_count = 512,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 0,
+ .stop_threshold = AFE_PROXY_RECORD_PERIOD_SIZE * AFE_PROXY_RECORD_PERIOD_COUNT,
+ .silence_threshold = 0,
+ .silence_size = 0,
+ .avail_min = 24, //1 ms
+};
+struct pcm_config pcm_config_audio_capture_rt_16KHz = {
+ .channels = 2,
+ .rate = 16000,
+ .period_size = 16,
+ .period_count = 512,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 0,
+ .stop_threshold = AFE_PROXY_RECORD_PERIOD_SIZE * AFE_PROXY_RECORD_PERIOD_COUNT,
+ .silence_threshold = 0,
+ .silence_size = 0,
+ .avail_min = 16, //1 ms
+};
+struct pcm_config pcm_config_audio_capture_rt_8KHz = {
+ .channels = 2,
+ .rate = 8000,
+ .period_size = 8,
+ .period_count = 512,
+ .format = PCM_FORMAT_S16_LE,
+ .start_threshold = 0,
+ .stop_threshold = AFE_PROXY_RECORD_PERIOD_SIZE * AFE_PROXY_RECORD_PERIOD_COUNT,
+ .silence_threshold = 0,
+ .silence_size = 0,
+ .avail_min = 8, //1 ms
+};
+
struct pcm_config pcm_config_afe_proxy_record = {
.channels = AFE_PROXY_CHANNEL_COUNT,
.rate = AFE_PROXY_SAMPLING_RATE,
@@ -362,6 +423,8 @@
[USECASE_AUDIO_PLAYBACK_TTS] = "audio-tts-playback",
[USECASE_AUDIO_RECORD] = "audio-record",
+ [USECASE_AUDIO_RECORD2] = "audio-record2",
+ [USECASE_AUDIO_RECORD3] = "audio-record3",
[USECASE_AUDIO_RECORD_COMPRESS] = "audio-record-compress",
[USECASE_AUDIO_RECORD_COMPRESS2] = "audio-record-compress2",
[USECASE_AUDIO_RECORD_COMPRESS3] = "audio-record-compress3",
@@ -527,6 +590,12 @@
effect_handle_t handle;
};
+static const audio_usecase_t record_usecases[] = {
+ USECASE_AUDIO_RECORD,
+ USECASE_AUDIO_RECORD2,
+ USECASE_AUDIO_RECORD3,
+};
+
static struct audio_device *adev = NULL;
static pthread_mutex_t adev_init_lock = PTHREAD_MUTEX_INITIALIZER;
static unsigned int audio_device_ref_count;
@@ -537,7 +606,9 @@
static int out_set_mmap_volume(struct audio_stream_out *stream, float left, float right);
static int out_set_voip_volume(struct audio_stream_out *stream, float left, float right);
static int out_set_pcm_volume(struct audio_stream_out *stream, float left, float right);
-
+#ifdef SOFT_VOLUME
+static int out_set_soft_volume_params(struct audio_stream_out *stream);
+#endif
static void adev_snd_mon_cb(void *cookie, struct str_parms *parms);
static void in_snd_mon_cb(void * stream, struct str_parms * parms);
static void out_snd_mon_cb(void * stream, struct str_parms * parms);
@@ -560,6 +631,52 @@
audio_microphone_direction_t dir);
static int in_set_microphone_field_dimension(const struct audio_stream_in *stream, float zoom);
+static bool is_pcm_record_usecase(audio_usecase_t uc_id)
+{
+ unsigned int record_uc_index;
+ unsigned int num_usecase = sizeof(record_usecases)/sizeof(record_usecases[0]);
+
+ for (record_uc_index = 0; record_uc_index < num_usecase; record_uc_index++) {
+ if (uc_id == record_usecases[record_uc_index])
+ return true;
+ }
+ return false;
+}
+
+static audio_usecase_t get_record_usecase(struct audio_device *adev)
+{
+ audio_usecase_t ret_uc = USECASE_INVALID;
+ unsigned int record_uc_index;
+ unsigned int num_usecase = sizeof(record_usecases)/sizeof(record_usecases[0]);
+
+ ALOGV("%s: num_usecase: %d", __func__, num_usecase);
+ for (record_uc_index = 0; record_uc_index < num_usecase; record_uc_index++) {
+ if (!(adev->pcm_record_uc_state & (0x1 << record_uc_index))) {
+ adev->pcm_record_uc_state |= 0x1 << record_uc_index;
+ ret_uc = record_usecases[record_uc_index];
+ break;
+ }
+ }
+
+ ALOGV("%s: pcm record usecase is %d", __func__, ret_uc);
+ return ret_uc;
+}
+
+static void free_record_usecase(struct audio_device *adev,
+ audio_usecase_t uc_id)
+{
+ unsigned int record_uc_index;
+ unsigned int num_usecase = sizeof(record_usecases)/sizeof(record_usecases[0]);
+
+ for (record_uc_index = 0; record_uc_index < num_usecase; record_uc_index++) {
+ if (record_usecases[record_uc_index] == uc_id) {
+ adev->pcm_record_uc_state &= ~(0x1 << record_uc_index);
+ break;
+ }
+ }
+ ALOGV("%s: free pcm record usecase %d", __func__, uc_id);
+}
+
static bool may_use_noirq_mode(struct audio_device *adev, audio_usecase_t uc_id,
int flags __unused)
{
@@ -597,8 +714,8 @@
if (!adev->adm_set_config)
return;
- if (out->realtime)
- adev->adm_set_config(adev->adm_data,
+ if (out->realtime || (out->flags & AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION))
+ adev->adm_set_config(adev->adm_data,
out->handle,
out->pcm, &out->config);
}
@@ -1283,6 +1400,7 @@
platform_set_echo_reference(adev, true, &out_devices);
in->ec_opened = true;
+ clear_devices(&out_devices);
}
}
} else if ((usecase->type == TRANSCODE_LOOPBACK_TX) || ((usecase->type == PCM_HFP_CALL) &&
@@ -1409,6 +1527,7 @@
list_init(&out_devices);
platform_set_echo_reference(in->dev, false, &out_devices);
in->ec_opened = false;
+ clear_devices(&out_devices);
}
}
if (usecase->id == adev->fluence_nn_usecase_id) {
@@ -1822,6 +1941,9 @@
}
}
+ clear_devices(&a1);
+ clear_devices(&a2);
+
end:
return d2; // return whatever was calculated before.
}
@@ -2072,7 +2194,7 @@
((uc_info->type == VOICE_CALL &&
is_single_device_type_equal(&usecase->device_list,
AUDIO_DEVICE_IN_VOICE_CALL)) ||
- platform_check_backends_match(snd_device,\
+ platform_check_all_backends_match(snd_device,\
usecase->in_snd_device))) &&
(usecase->id != USECASE_AUDIO_SPKR_CALIB_TX)) {
ALOGD("%s: Usecase (%s) is active on (%s) - disabling ..",
@@ -2812,6 +2934,7 @@
out_snd_device = platform_get_output_snd_device(adev->platform, &stream_out, usecase->type);
assign_devices(&usecase->device_list,
&usecase->stream.inout->out_config.device_list);
+ clear_devices(&stream_out.device_list);
} else if (usecase->type == TRANSCODE_LOOPBACK_TX ) {
if (usecase->stream.inout == NULL) {
ALOGE("%s: stream.inout is NULL", __func__);
@@ -2823,6 +2946,7 @@
&out_devices, usecase->type);
assign_devices(&usecase->device_list,
&usecase->stream.inout->in_config.device_list);
+ clear_devices(&out_devices);
} else {
/*
* If the voice call is active, use the sound devices of voice call usecase
@@ -2962,6 +3086,7 @@
priority_in,
&out_devices,
usecase->type);
+ clear_devices(&out_devices);
}
}
}
@@ -3124,7 +3249,11 @@
!audio_is_true_native_stream_active(adev)) &&
usecase->stream.out->sample_rate == OUTPUT_SAMPLING_RATE_44100) ||
(usecase->stream.out->sample_rate < OUTPUT_SAMPLING_RATE_44100)) {
- usecase->stream.out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+ if (!(compare_device_type(&usecase->device_list, AUDIO_DEVICE_OUT_BUS) && ((usecase->stream.out->flags &
+ (audio_output_flags_t)AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION) || (usecase->stream.out->flags &
+ (audio_output_flags_t)AUDIO_OUTPUT_FLAG_PHONE)))) {
+ usecase->stream.out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+ }
}
}
enable_audio_route(adev, usecase);
@@ -3294,6 +3423,7 @@
audio_extn_keep_alive_stop(KEEP_ALIVE_OUT_PRIMARY);
list_remove(&uc_info->list);
+ clear_devices(&uc_info->device_list);
free(uc_info);
if (priority_in == in) {
@@ -3334,8 +3464,9 @@
__func__, &in->stream, in->usecase, use_case_table[in->usecase]);
if (CARD_STATUS_OFFLINE == in->card_status||
- CARD_STATUS_OFFLINE == adev->card_status) {
- ALOGW("in->card_status or adev->card_status offline, try again");
+ CARD_STATUS_OFFLINE == adev->card_status ||
+ POWER_POLICY_STATUS_OFFLINE == adev->in_power_policy) {
+ ALOGW("in->card_status or adev->card_status or adev->input_power offline, try again");
ret = -EIO;
goto error_config;
}
@@ -3477,7 +3608,8 @@
in->pcm = NULL;
goto error_open;
}
- register_in_stream(in);
+ if (in->flags == AUDIO_INPUT_FLAG_FAST)
+ register_in_stream(in);
if (in->realtime) {
ATRACE_BEGIN("pcm_in_start");
ret = pcm_start(in->pcm);
@@ -3754,7 +3886,8 @@
else
ALOGE("%s: Next track returned error %d",__func__, ret);
if (-ENETRESET != ret && !(-EINTR == ret &&
- CARD_STATUS_OFFLINE == out->card_status)) {
+ (CARD_STATUS_OFFLINE == out->card_status ||
+ POWER_POLICY_STATUS_OFFLINE == adev->out_power_policy))) {
send_callback = true;
pthread_mutex_lock(&out->lock);
out->send_new_metadata = 1;
@@ -3771,7 +3904,8 @@
ALOGD("copl(%p):out of compress_drain", out);
// EINTR check avoids drain interruption due to SSR
if (-ENETRESET != ret && !(-EINTR == ret &&
- CARD_STATUS_OFFLINE == out->card_status)) {
+ (CARD_STATUS_OFFLINE == out->card_status ||
+ POWER_POLICY_STATUS_OFFLINE == adev->out_power_policy))) {
send_callback = true;
event = STREAM_CBK_EVENT_DRAIN_READY;
} else
@@ -3942,6 +4076,7 @@
}
}
+ clear_devices(&uc_info->device_list);
free(uc_info);
ALOGV("%s: exit: status(%d)", __func__, ret);
return ret;
@@ -4010,7 +4145,8 @@
AUDIO_DEVICE_OUT_SPEAKER_SAFE);
if (CARD_STATUS_OFFLINE == out->card_status ||
- CARD_STATUS_OFFLINE == adev->card_status) {
+ CARD_STATUS_OFFLINE == adev->card_status ||
+ POWER_POLICY_STATUS_OFFLINE == adev->out_power_policy) {
ALOGW("out->card_status or adev->card_status offline, try again");
ret = -EIO;
goto error_fatal;
@@ -4125,6 +4261,7 @@
AUDIO_DEVICE_OUT_SPEAKER, "");
select_devices(adev, out->usecase);
assign_devices(&out->device_list, &dev);
+ clear_devices(&dev);
}
} else {
select_devices(adev, out->usecase);
@@ -4142,6 +4279,7 @@
AUDIO_DEVICE_OUT_SPEAKER, "");
select_devices(adev, out->usecase);
assign_devices(&out->device_list, &dev);
+ clear_devices(&dev);
} else {
ret = -EINVAL;
goto error_open;
@@ -4239,6 +4377,9 @@
out->apply_volume = false;
} else if (audio_extn_auto_hal_is_bus_device_usecase(out->usecase)) {
out_set_pcm_volume(&out->stream, out->volume_l, out->volume_r);
+#ifdef SOFT_VOLUME
+ out_set_soft_volume_params(&out->stream);
+#endif
}
} else {
/*
@@ -4327,7 +4468,8 @@
}
if (ret == 0) {
- register_out_stream(out);
+ if (out->flags == AUDIO_OUTPUT_FLAG_FAST)
+ register_out_stream(out);
if (out->realtime) {
if (out->pcm == NULL || !pcm_is_ready(out->pcm)) {
ALOGE("%s: pcm stream not ready", __func__);
@@ -4533,8 +4675,27 @@
uint32_t bytes_per_period_sample = 0;
size = (sample_rate * duration_ms) / 1000;
- if (is_low_latency)
- size = configured_low_latency_capture_period_size;
+ if (is_low_latency){
+ switch(sample_rate) {
+ case 48000:
+ size = 240;
+ break;
+ case 32000:
+ size = 160;
+ break;
+ case 24000:
+ size = 120;
+ break;
+ case 16000:
+ size = 80;
+ break;
+ case 8000:
+ size = 40;
+ break;
+ default:
+ size = 240;
+ }
+ }
bytes_per_period_sample = audio_bytes_per_sample(format) * channel_count;
size *= audio_bytes_per_sample(format) * channel_count;
@@ -5192,6 +5353,7 @@
/*handles device and call state changes*/
audio_extn_extspk_update(adev->extspk);
+ clear_devices(&new_devices);
error:
ALOGV("%s: exit: code(%d)", __func__, ret);
return ret;
@@ -5584,7 +5746,8 @@
} else {
latency = (out->config.period_count * out->config.period_size * 1000) /
(out->config.rate);
- if (out->usecase == USECASE_AUDIO_PLAYBACK_DEEP_BUFFER)
+ if (out->usecase == USECASE_AUDIO_PLAYBACK_DEEP_BUFFER ||
+ out->usecase == USECASE_AUDIO_PLAYBACK_LOW_LATENCY)
latency += platform_render_latency(out)/1000;
}
@@ -5606,6 +5769,57 @@
return db;
}
+#ifdef SOFT_VOLUME
+static int out_set_soft_volume_params(struct audio_stream_out *stream)
+{
+ struct stream_out *out = (struct stream_out *)stream;
+ int ret = 0;
+ char mixer_ctl_name[128];
+ struct audio_device *adev = out->dev;
+ struct mixer_ctl *ctl = NULL;
+ struct soft_step_volume_params *volume_params = NULL;
+
+ int pcm_device_id = platform_get_pcm_device_id(out->usecase, PCM_PLAYBACK);
+ snprintf(mixer_ctl_name, sizeof(mixer_ctl_name), "Playback %d Soft Vol Params", pcm_device_id);
+ ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
+ if (!ctl) {
+ ALOGE("%s : Could not get ctl for mixer cmd - %s", __func__, mixer_ctl_name);
+ return -EINVAL;
+ }
+
+ volume_params =(struct soft_step_volume_params * ) malloc(sizeof(struct soft_step_volume_params));
+ if (volume_params == NULL){
+ ALOGE("%s : malloc is failed for volume params", __func__);
+ return -EINVAL;
+ } else {
+ ret = platform_get_soft_step_volume_params(volume_params,out->usecase);
+ if (ret < 0) {
+ ALOGE("%s : platform_get_soft_step_volume_params is fialed", __func__);
+ ret = -EINVAL;
+ goto ERR_EXIT;
+ }
+
+ }
+ ret = mixer_ctl_set_array(ctl, volume_params, sizeof(struct soft_step_volume_params)/sizeof(int));
+ if (ret < 0) {
+ ALOGE("%s: Could not set ctl, error:%d ", __func__, ret);
+ ret = -EINVAL;
+ goto ERR_EXIT;
+ }
+
+ if (volume_params) {
+ free(volume_params);
+ }
+ return 0;
+
+ERR_EXIT:
+ if (volume_params) {
+ free(volume_params);
+ }
+ return ret;
+}
+#endif
+
static int out_set_mmap_volume(struct audio_stream_out *stream, float left,
float right)
{
@@ -5970,7 +6184,8 @@
ATRACE_BEGIN("out_write");
lock_output_stream(out);
- if (CARD_STATUS_OFFLINE == out->card_status) {
+ if (CARD_STATUS_OFFLINE == out->card_status ||
+ POWER_POLICY_STATUS_OFFLINE == adev->out_power_policy) {
if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
/*during SSR for compress usecase we should return error to flinger*/
@@ -6435,7 +6650,8 @@
} else if(ret < 0) {
ALOGE(" ERROR: Unable to get time stamp from compress driver");
ret = -EINVAL;
- } else if (out->card_status == CARD_STATUS_OFFLINE) {
+ } else if (out->card_status == CARD_STATUS_OFFLINE ||
+ adev->out_power_policy == POWER_POLICY_STATUS_OFFLINE) {
/*
* Handle corner case where compress session is closed during SSR
* and timestamp is queried
@@ -6564,6 +6780,7 @@
ret = 0;
}
} else if (out->card_status == CARD_STATUS_OFFLINE ||
+ adev->out_power_policy == POWER_POLICY_STATUS_OFFLINE ||
// audioflinger still needs position updates when A2DP is suspended
(is_a2dp_out_device_type(&out->device_list) && audio_extn_a2dp_source_is_suspended())) {
*frames = out->written;
@@ -6785,7 +7002,8 @@
pthread_mutex_lock(&adev->lock);
if (CARD_STATUS_OFFLINE == out->card_status ||
- CARD_STATUS_OFFLINE == adev->card_status) {
+ CARD_STATUS_OFFLINE == adev->card_status ||
+ POWER_POLICY_STATUS_OFFLINE == adev->out_power_policy) {
ALOGW("out->card_status or adev->card_status offline, try again");
ret = -EIO;
goto exit;
@@ -7673,7 +7891,8 @@
ALOGV("%s in %p", __func__, in);
if (CARD_STATUS_OFFLINE == in->card_status||
- CARD_STATUS_OFFLINE == adev->card_status) {
+ CARD_STATUS_OFFLINE == adev->card_status ||
+ POWER_POLICY_STATUS_OFFLINE == adev->in_power_policy) {
ALOGW("in->card_status or adev->card_status offline, try again");
ret = -EIO;
goto exit;
@@ -7882,6 +8101,7 @@
}
}
+ clear_devices(&devices);
pthread_mutex_unlock(&adev->lock);
pthread_mutex_unlock(&in->lock);
}
@@ -8869,11 +9089,57 @@
pthread_mutex_destroy(&out->position_query_lock);
pthread_mutex_lock(&adev->lock);
+ clear_devices(&out->device_list);
free(stream);
pthread_mutex_unlock(&adev->lock);
ALOGV("%s: exit", __func__);
}
+void in_set_power_policy(uint8_t enable)
+{
+ struct listnode *node;
+
+ ALOGD("%s: Enter, state %d", __func__, enable);
+
+ pthread_mutex_lock(&adev->lock);
+ adev->in_power_policy = enable ? POWER_POLICY_STATUS_ONLINE : POWER_POLICY_STATUS_OFFLINE;
+ pthread_mutex_unlock(&adev->lock);
+
+ if (!enable) {
+ list_for_each(node, &adev->active_inputs_list) {
+ streams_input_ctxt_t *in_ctxt = node_to_item(node,
+ streams_input_ctxt_t,
+ list);
+ struct stream_in *in = in_ctxt->input;
+ in_standby(&in->stream.common);
+ }
+ }
+
+ ALOGD("%s: Exit", __func__);
+}
+
+void out_set_power_policy(uint8_t enable)
+{
+ struct listnode *node;
+
+ ALOGD("%s: Enter, state %d", __func__, enable);
+
+ pthread_mutex_lock(&adev->lock);
+ adev->out_power_policy = enable ? POWER_POLICY_STATUS_ONLINE : POWER_POLICY_STATUS_OFFLINE;
+ pthread_mutex_unlock(&adev->lock);
+
+ if (!enable) {
+ list_for_each(node, &adev->active_outputs_list) {
+ streams_output_ctxt_t *out_ctxt = node_to_item(node,
+ streams_output_ctxt_t,
+ list);
+ struct stream_out *out = out_ctxt->output;
+ out_on_error(&out->stream.common);
+ }
+ }
+
+ ALOGD("%s: Exit", __func__);
+}
static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs)
{
struct audio_device *adev = (struct audio_device *)dev;
@@ -9645,7 +9911,7 @@
ret = audio_extn_auto_hal_open_echo_reference_stream(in);
}
- if (in->source == AUDIO_SOURCE_FM_TUNER) {
+ if ((in->source == AUDIO_SOURCE_FM_TUNER) || (devices == AUDIO_DEVICE_IN_FM_TUNER)) {
if(!get_usecase_from_list(adev, USECASE_AUDIO_RECORD_FM_VIRTUAL))
in->usecase = USECASE_AUDIO_RECORD_FM_VIRTUAL;
else {
@@ -9654,7 +9920,11 @@
}
}
- if (config->sample_rate == LOW_LATENCY_CAPTURE_SAMPLE_RATE &&
+ if ((config->sample_rate == 48000 ||
+ config->sample_rate == 32000 ||
+ config->sample_rate == 24000 ||
+ config->sample_rate == 16000 ||
+ config->sample_rate == 8000)&&
(flags & AUDIO_INPUT_FLAG_TIMESTAMP) == 0 &&
(flags & AUDIO_INPUT_FLAG_COMPRESS) == 0 &&
(flags & AUDIO_INPUT_FLAG_FAST) != 0) {
@@ -9678,7 +9948,26 @@
in->af_period_multiplier = 1;
} else {
// period size is left untouched for rt mode playback
- in->config = pcm_config_audio_capture_rt;
+ switch(config->sample_rate)
+ {
+ case 48000:
+ in->config = pcm_config_audio_capture_rt_48KHz;
+ break;
+ case 32000:
+ in->config = pcm_config_audio_capture_rt_32KHz;
+ break;
+ case 24000:
+ in->config = pcm_config_audio_capture_rt_24KHz;
+ break;
+ case 16000:
+ in->config = pcm_config_audio_capture_rt_16KHz;
+ break;
+ case 8000:
+ in->config = pcm_config_audio_capture_rt_8KHz;
+ break;
+ default:
+ in->config = pcm_config_audio_capture_rt_48KHz;
+ }
in->af_period_multiplier = af_period_multiplier;
}
}
@@ -9772,7 +10061,26 @@
in->config.rate = config->sample_rate;
in->af_period_multiplier = 1;
} else if (in->realtime) {
- in->config = pcm_config_audio_capture_rt;
+ switch(config->sample_rate)
+ {
+ case 48000:
+ in->config = pcm_config_audio_capture_rt_48KHz;
+ break;
+ case 32000:
+ in->config = pcm_config_audio_capture_rt_32KHz;
+ break;
+ case 24000:
+ in->config = pcm_config_audio_capture_rt_24KHz;
+ break;
+ case 16000:
+ in->config = pcm_config_audio_capture_rt_16KHz;
+ break;
+ case 8000:
+ in->config = pcm_config_audio_capture_rt_8KHz;
+ break;
+ default:
+ in->config = pcm_config_audio_capture_rt_48KHz;
+ }
in->config.format = pcm_format_from_audio_format(config->format);
in->af_period_multiplier = af_period_multiplier;
} else {
@@ -9842,6 +10150,9 @@
ALOGV("%s: using USECASE_AUDIO_RECORD",__func__);
adev->pcm_record_uc_state = 1;
pthread_mutex_unlock(&adev->lock);
+ } else if (audio_extn_is_concurrent_pcm_record_enabled()) {
+ in->usecase = get_record_usecase(adev);
+ pthread_mutex_unlock(&adev->lock);
} else {
pthread_mutex_unlock(&adev->lock);
/* Assign compress record use case for second record */
@@ -9858,6 +10169,7 @@
}
}
}
+
if (audio_extn_ssr_get_stream() != in)
in->config.channels = channel_count;
@@ -9908,7 +10220,9 @@
return ret;
err_open:
- if (in->usecase == USECASE_AUDIO_RECORD) {
+ if (audio_extn_is_concurrent_pcm_record_enabled() && is_pcm_record_usecase(in->usecase)) {
+ free_record_usecase(adev, in->usecase);
+ } else if (in->usecase == USECASE_AUDIO_RECORD) {
pthread_mutex_lock(&adev->lock);
adev->pcm_record_uc_state = 0;
pthread_mutex_unlock(&adev->lock);
@@ -9953,6 +10267,7 @@
struct listnode out_devices;
list_init(&out_devices);
platform_set_echo_reference(adev, false, &out_devices);
+ clear_devices(&out_devices);
} else
audio_extn_sound_trigger_update_ec_ref_status(false);
@@ -9975,7 +10290,9 @@
pthread_mutex_destroy(&in->pre_lock);
pthread_mutex_lock(&adev->lock);
- if (in->usecase == USECASE_AUDIO_RECORD) {
+ if (audio_extn_is_concurrent_pcm_record_enabled() && is_pcm_record_usecase(in->usecase)) {
+ free_record_usecase(adev, in->usecase);
+ } else if (in->usecase == USECASE_AUDIO_RECORD) {
adev->pcm_record_uc_state = 0;
}
@@ -10002,6 +10319,7 @@
ALOGV("%s: sound trigger pcm stop lab", __func__);
audio_extn_sound_trigger_stop_lab(in);
}
+ clear_devices(&in->device_list);
free(stream);
pthread_mutex_unlock(&adev->lock);
return;
@@ -10312,10 +10630,11 @@
// Update routing for stream
if (stream != NULL) {
- if (p_info->patch_type == PATCH_PLAYBACK)
+ if (p_info->patch_type == PATCH_PLAYBACK) {
ret = route_output_stream((struct stream_out *) stream, &devices);
- else if (p_info->patch_type == PATCH_CAPTURE)
+ } else if (p_info->patch_type == PATCH_CAPTURE) {
ret = route_input_stream((struct stream_in *) stream, &devices, input_source);
+ }
if (ret < 0) {
pthread_mutex_lock(&adev->lock);
s_info->patch_handle = AUDIO_PATCH_HANDLE_NONE;
@@ -10336,6 +10655,7 @@
}
done:
+ clear_devices(&devices);
audio_extn_hw_loopback_create_audio_patch(dev,
num_sources,
sources,
@@ -10421,6 +10741,7 @@
ret = route_output_stream((struct stream_out *) stream, &devices);
else if (patch_type == PATCH_CAPTURE)
ret = route_input_stream((struct stream_in *) stream, &devices, input_source);
+ clear_devices(&devices);
}
if (ret < 0)
@@ -10660,6 +10981,7 @@
}
pthread_mutex_unlock(&out->latch_lock);
}
+ clear_devices(&devices);
ALOGV("%s: exit", __func__);
return 0;
}
@@ -10977,6 +11299,8 @@
pthread_mutex_lock(&adev->lock);
audio_extn_snd_mon_register_listener(adev, adev_snd_mon_cb);
adev->card_status = CARD_STATUS_ONLINE;
+ adev->out_power_policy = POWER_POLICY_STATUS_ONLINE;
+ adev->in_power_policy = POWER_POLICY_STATUS_ONLINE;
audio_extn_battery_properties_listener_init(adev_on_battery_status_changed);
/*
* if the battery state callback happens before charging can be queried,
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
old mode 100755
new mode 100644
index 4def602..5352629
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -33,6 +33,40 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+
+ * Changes from Qualcomm Innovation Center are provided under the following license:
+
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+
+ * * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QCOM_AUDIO_HW_H
@@ -160,6 +194,10 @@
CARD_STATUS_ONLINE
} card_status_t;
+typedef enum power_policy_status_t {
+ POWER_POLICY_STATUS_OFFLINE,
+ POWER_POLICY_STATUS_ONLINE
+} power_policy_status_t;
/* These are the supported use cases by the hardware.
* Each usecase is mapped to a specific PCM device.
* Refer to pcm_device_table[].
@@ -197,6 +235,8 @@
/* Capture usecases */
USECASE_AUDIO_RECORD,
+ USECASE_AUDIO_RECORD2,
+ USECASE_AUDIO_RECORD3,
USECASE_AUDIO_RECORD_COMPRESS,
USECASE_AUDIO_RECORD_COMPRESS2,
USECASE_AUDIO_RECORD_COMPRESS3,
@@ -716,6 +756,8 @@
int snd_card;
card_status_t card_status;
+ power_policy_status_t out_power_policy;
+ power_policy_status_t in_power_policy;
unsigned int cur_codec_backend_samplerate;
unsigned int cur_codec_backend_bit_width;
bool is_channel_status_set;
@@ -804,6 +846,17 @@
struct audio_patch patch;
};
+#ifdef SOFT_VOLUME
+/* this struct is used for set/get values from AHAL*/
+struct soft_step_volume_params {
+ int period;
+ int step;
+ int curve;
+};
+#endif
+void out_set_power_policy(uint8_t enable);
+void in_set_power_policy(uint8_t enable);
+
int select_devices(struct audio_device *adev,
audio_usecase_t uc_id);
int disable_audio_route(struct audio_device *adev,
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 6115614..59c3c8f 100755
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -402,6 +402,17 @@
char chmap[AUDIO_CHANNEL_COUNT_MAX];
};
+#ifdef SOFT_VOLUME
+static int usecase_volume_params[AUDIO_USECASE_MAX][3] = {
+ [USECASE_AUDIO_PLAYBACK_DEEP_BUFFER] = {-1,-1,-1},
+ [USECASE_AUDIO_PLAYBACK_MEDIA] = {-1,-1,-1},
+ [USECASE_AUDIO_PLAYBACK_SYS_NOTIFICATION] = {-1,-1,-1},
+ [USECASE_AUDIO_PLAYBACK_NAV_GUIDANCE] = {-1,-1,-1},
+ [USECASE_AUDIO_PLAYBACK_FRONT_PASSENGER] = {-1,-1,-1},
+ [USECASE_AUDIO_PLAYBACK_REAR_SEAT] = {-1,-1,-1},
+};
+#endif
+
static int pcm_device_table[AUDIO_USECASE_MAX][2] = {
[USECASE_AUDIO_PLAYBACK_DEEP_BUFFER] = {DEEP_BUFFER_PCM_DEVICE,
DEEP_BUFFER_PCM_DEVICE},
@@ -440,8 +451,10 @@
[USECASE_AUDIO_RECORD] = {AUDIO_RECORD_PCM_DEVICE, AUDIO_RECORD_PCM_DEVICE},
+ [USECASE_AUDIO_RECORD2] = {AUDIO_RECORD_PCM_DEVICE, AUDIO_RECORD_PCM_DEVICE},
+ [USECASE_AUDIO_RECORD3] = {AUDIO_RECORD_PCM_DEVICE, AUDIO_RECORD_PCM_DEVICE},
[USECASE_AUDIO_RECORD_COMPRESS] = {COMPRESS_CAPTURE_DEVICE, COMPRESS_CAPTURE_DEVICE},
- [USECASE_AUDIO_RECORD_COMPRESS2] = {-1, -1},
+ [USECASE_AUDIO_RECORD_COMPRESS2] = {COMPRESS_CAPTURE_DEVICE,COMPRESS_CAPTURE_DEVICE},
[USECASE_AUDIO_RECORD_COMPRESS3] = {-1, -1},
[USECASE_AUDIO_RECORD_COMPRESS4] = {-1, -1},
[USECASE_AUDIO_RECORD_COMPRESS5] = {-1, -1},
@@ -849,6 +862,9 @@
[GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_MIC)][EFFECT_AEC] = {TX_VOICE_FLUENCEV5_SM, 0x0, 0x10EAF, 0x01},
[GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_MIC)][EFFECT_NS] = {TX_VOICE_FLUENCEV5_SM, 0x0, 0x10EAF, 0x02},
+
+ [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_DMIC_STEREO)][EFFECT_AEC] = {TX_VOICE_TM_FLUENCE_EF, 0x0, 0x10EAF, 0x01},
+ [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_DMIC_STEREO)][EFFECT_NS] = {TX_VOICE_TM_FLUENCE_EF, 0x0, 0x10EAF, 0x02},
};
static struct audio_fluence_mmsecns_config fluence_mmsecns_table = {TOPOLOGY_ID_MM_HFP_ECNS, MODULE_ID_MM_HFP_ECNS,
@@ -1392,6 +1408,8 @@
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD9)},
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_MMAP)},
{TO_NAME_INDEX(USECASE_AUDIO_RECORD)},
+ {TO_NAME_INDEX(USECASE_AUDIO_RECORD2)},
+ {TO_NAME_INDEX(USECASE_AUDIO_RECORD3)},
{TO_NAME_INDEX(USECASE_AUDIO_RECORD_COMPRESS)},
{TO_NAME_INDEX(USECASE_AUDIO_RECORD_COMPRESS2)},
{TO_NAME_INDEX(USECASE_AUDIO_RECORD_COMPRESS3)},
@@ -6922,6 +6940,7 @@
ALOGE("%s: Unknown device(s) %#x", __func__, get_device_types(&devices));
}
exit:
+ clear_devices(&devices);
ALOGV("%s: exit: snd_device(%s)", __func__, device_table[snd_device]);
return snd_device;
}
@@ -7766,6 +7785,7 @@
}
}
exit:
+ clear_devices(&in_devices);
ALOGV("%s: exit: in_snd_device(%s)", __func__, device_table[snd_device]);
return snd_device;
}
@@ -11908,7 +11928,9 @@
if ((!strcmp(snd_card_name, "msm8953-snd-card-mtp")) ||
(!strcmp(snd_card_name, "msm8953-sku4-snd-card")) ||
(!strcmp(snd_card_name, "sdm439-sku1-snd-card")) ||
- (!strcmp(snd_card_name, "sdm439-snd-card-mtp")))
+ (!strcmp(snd_card_name, "sdm439-snd-card-mtp")) ||
+ (!strcmp(snd_card_name, "bengal-qrd-snd-card")) ||
+ (!strcmp(snd_card_name, "bengal-scubaqrd-snd-card")))
return 1;
else
return 0;
@@ -12554,6 +12576,48 @@
return true;
}
+#ifdef SOFT_VOLUME
+int platform_get_soft_step_volume_params(struct soft_step_volume_params *volume_params, int uc_id)
+{
+ int ret = 0;
+
+ if (volume_params == NULL) {
+ ALOGE("%s: Invalid volume_params", __func__);
+ ret = -EINVAL;
+ goto done;
+ }
+
+ if ((usecase_volume_params[uc_id][0] < 0) || (usecase_volume_params[uc_id][1] < 0) || (usecase_volume_params[uc_id][2] < 0) ) {
+ ALOGE("%s: soft step volume params values are not set dynamically,will use default static values set through cal data",__func__);
+ ret = -EINVAL;
+ } else {
+ memcpy(volume_params,usecase_volume_params[uc_id],sizeof(struct soft_step_volume_params));
+ ALOGV("%s: usecase-id = %d, ramp period = %d, ramp step = %d, ramp curve = %d",
+ __func__, uc_id, volume_params->period, volume_params->step, volume_params->curve);
+ }
+done:
+ return ret;
+}
+
+int platform_set_soft_step_volume_params(int uc_id, int period, int step, int curve)
+{
+ int ret = 0;
+
+ ALOGV("%s: usecase-id = %d, ramp period = %d, ramp step = %d, ramp curve = %d",
+ __func__, uc_id, period, step, curve);
+ if ((uc_id < 0) || (uc_id >= AUDIO_USECASE_MAX)) {
+ ALOGE("%s : invalid usecase id", __func__);
+ ret = -EINVAL;
+ }
+
+ usecase_volume_params[uc_id][0] = period;
+ usecase_volume_params[uc_id][1] = step;
+ usecase_volume_params[uc_id][2] = curve;
+
+ return ret;
+}
+#endif
+
int platform_get_active_microphones(void *platform, unsigned int channels,
audio_usecase_t uc_id,
struct audio_microphone_characteristic_t *mic_array,
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 4d09144..25ebc08 100755
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -703,6 +703,11 @@
#define HFP_ASM_RX_TX 18
#define HFP_SEC_SCO_RX -1
#define HFP_SEC_ASM_RX_TX -1
+#elif PLATFORM_MSMSTEPPE
+#define HFP_SCO_RX 12
+#define HFP_ASM_RX_TX 37
+#define HFP_SEC_SCO_RX -1
+#define HFP_SEC_ASM_RX_TX -1
#else
#define HFP_SCO_RX 23
#define HFP_ASM_RX_TX 24
diff --git a/hal/platform_api.h b/hal/platform_api.h
old mode 100644
new mode 100755
index bea9675..805db2f
--- a/hal/platform_api.h
+++ b/hal/platform_api.h
@@ -15,6 +15,41 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+
+ * Changes from Qualcomm Innovation Center are provided under the following license:
+
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+
+ * * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
*/
#ifndef AUDIO_PLATFORM_API_H
@@ -440,4 +475,8 @@
void platform_reset_island_power_status(void *platform, snd_device_t snd_device);
void platform_is_volume_boost_supported_device(void *platform, struct listnode *devices);
const char *platform_get_mixer_FM_RX_control(struct audio_device *adev);
+#ifdef SOFT_VOLUME
+int platform_set_soft_step_volume_params(int uc_id, int period, int step, int curve);
+int platform_get_soft_step_volume_params(struct soft_step_volume_params *volume_params, int uc_id);
+#endif
#endif // AUDIO_PLATFORM_API_H
diff --git a/hal/platform_info.c b/hal/platform_info.c
index 9cfd760..b2fbb5f 100755
--- a/hal/platform_info.c
+++ b/hal/platform_info.c
@@ -25,6 +25,40 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ * Changes from Qualcomm Innovation Center are provided under the following license:
+
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+
+ * * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#define LOG_TAG "platform_info"
@@ -85,6 +119,9 @@
CUSTOM_MTMX_PARAM_IN_CH_INFO,
MMSECNS,
AUDIO_SOURCE_DELAY,
+#ifdef SOFT_VOLUME
+ SOFT_VOLUME_PARAMS,
+#endif
} section_t;
typedef void (* section_process_fn)(const XML_Char **attr);
@@ -122,6 +159,9 @@
static void process_custom_mtmx_param_in_ch_info(const XML_Char **attr);
static void process_fluence_mmsecns(const XML_Char **attr);
static void process_audio_source_delay(const XML_Char **attr);
+#ifdef SOFT_VOLUME
+static void process_soft_volume_params(const XML_Char **attr);
+#endif
static section_process_fn section_table[] = {
[ROOT] = process_root,
@@ -147,6 +187,9 @@
[CUSTOM_MTMX_PARAM_IN_CH_INFO] = process_custom_mtmx_param_in_ch_info,
[MMSECNS] = process_fluence_mmsecns,
[AUDIO_SOURCE_DELAY] = process_audio_source_delay,
+#ifdef SOFT_VOLUME
+ [SOFT_VOLUME_PARAMS] = process_soft_volume_params,
+#endif
};
static section_t section;
@@ -256,54 +299,59 @@
static struct audio_custom_mtmx_params_info mtmx_params_info;
static struct audio_custom_mtmx_in_params_info mtmx_in_params_info;
-/*
- * <audio_platform_info>
- * <acdb_ids>
- * <device name="???" acdb_id="???"/>
- * ...
- * ...
- * </acdb_ids>
- * <module_ids>
- * <device name="???" module_id="???"/>
- * ...
- * ...
- * </module_ids>
- * <backend_names>
- * <device name="???" backend="???"/>
- * ...
- * ...
- * </backend_names>
- * <pcm_ids>
- * <usecase name="???" type="in/out" id="???"/>
- * ...
- * ...
- * </pcm_ids>
- * <interface_names>
- * <device name="Use audio device name here, not sound device name" interface="PRIMARY_I2S" codec_type="external/internal"/>
- * ...
- * ...
- * </interface_names>
- * <config_params>
- * <param key="snd_card_name" value="msm8994-tomtom-mtp-snd-card"/>
- * <param key="operator_info" value="tmus;aa;bb;cc"/>
- * <param key="operator_info" value="sprint;xx;yy;zz"/>
- * ...
- * ...
- * </config_params>
- *
- * <operator_specific>
- * <device name="???" operator="???" mixer_path="???" acdb_id="???"/>
- * ...
- * ...
- * </operator_specific>
- *
- * </audio_platform_info>
- */
-
static void process_root(const XML_Char **attr __unused)
{
}
+#ifdef SOFT_VOLUME
+/**mapping usecase and soft volume params **/
+static void process_soft_volume_params(const XML_Char **attr)
+{
+ int index;
+
+ if (strcmp(attr[0], "name") != 0) {
+ ALOGE("%s: 'name' not found, no pcm_id set!", __func__);
+ goto done;
+ }
+
+ index = platform_get_usecase_index((char *)attr[1]);
+ if (index < 0) {
+ ALOGE("%s: usecase %s not found!",
+ __func__, attr[1]);
+ goto done;
+ }
+
+ if (strcmp(attr[2], "period") != 0) {
+ ALOGE("%s: ramp period not mentioned", __func__);
+ goto done;
+ }
+
+ int period = atoi((char *)attr[3]);
+
+ if (strcmp(attr[4], "step") != 0) {
+ ALOGE("%s: ramp period not mentioned", __func__);
+ goto done;
+ }
+ int step = atoi((char *)attr[5]);
+
+ if (strcmp(attr[6], "curve") != 0) {
+ ALOGE("%s: usecase id not mentioned", __func__);
+ goto done;
+ }
+
+ int curve = atoi((char *)attr[7]);
+
+ if (platform_set_soft_step_volume_params(index, period, step, curve) < 0) {
+ ALOGE("%s: usecase %s period %d step %d curve %d ",
+ __func__, attr[1], period, step, curve);
+ goto done;
+ }
+
+done:
+ return;
+}
+#endif
+
/* mapping from usecase to pcm dev id */
static void process_pcm_id(const XML_Char **attr)
{
@@ -1349,7 +1397,11 @@
section = MICROPHONE_CHARACTERISTIC;
} else if (strcmp(tag_name, "snd_devices") == 0) {
section = SND_DEVICES;
- } else if (strcmp(tag_name, "device") == 0) {
+#ifdef SOFT_VOLUME
+ } else if (strcmp(tag_name, "soft_vol_params") == 0) {
+ section = SOFT_VOLUME_PARAMS;
+#endif
+ } else if (strcmp(tag_name, "device") == 0) {
if ((section != ACDB) && (section != AEC) && (section != NS) && (section != MMSECNS) &&
(section != BACKEND_NAME) && (section != BITWIDTH) &&
(section != INTERFACE_NAME) && (section != OPERATOR_SPECIFIC)) {
@@ -1495,6 +1547,12 @@
} else if (strcmp(tag_name, "audio_source_delay") == 0) {
section_process_fn fn = section_table[section];
fn(attr);
+#ifdef SOFT_VOLUME
+ } else if (strcmp(tag_name, "vol_params") == 0) {
+ section = SOFT_VOLUME_PARAMS;
+ section_process_fn fn = section_table[section];
+ fn(attr);
+#endif
}
} else {
if(strcmp(tag_name, "config_params") == 0) {
@@ -1528,6 +1586,10 @@
section = MODULE;
} else if (strcmp(tag_name, "pcm_ids") == 0) {
section = ROOT;
+#ifdef SOFT_VOLUME
+ } else if (strcmp(tag_name, "soft_volume_params") == 0) {
+ section = ROOT;
+#endif
} else if (strcmp(tag_name, "backend_names") == 0) {
section = ROOT;
} else if (strcmp(tag_name, "config_params") == 0) {
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 0fa21db..cd38544 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -108,6 +108,10 @@
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
+ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
+LOCAL_HEADER_LIBRARIES += qti_legacy_audio_kernel_uapi
+endif
+
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
LOCAL_SANITIZE := integer_overflow
endif