Merge "configs: add sound trigger implementer version"
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..73ab934
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,353 @@
+Includes modifications licensed under:
+
+Copyright (c) 2019, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted 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 The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Android-specific code. ==
+ =========================================================================
+
+Android Code
+Copyright 2005-2008 The Android Open Source Project
+
+This product includes software developed as part of
+The Android Open Source Project (http://source.android.com).
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for Apache Commons code. ==
+ =========================================================================
+
+Apache Commons
+Copyright 1999-2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for Jakarta Commons Logging. ==
+ =========================================================================
+
+Jakarta Commons Logging (JCL)
+Copyright 2005,2006 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Nuance code. ==
+ =========================================================================
+
+These files are Copyright 2007 Nuance Communications, but released under
+the Apache2 License.
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Media Codecs code. ==
+ =========================================================================
+
+Media Codecs
+These files are Copyright 1998 - 2009 PacketVideo, but released under
+the Apache2 License.
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the TagSoup code. ==
+ =========================================================================
+
+This file is part of TagSoup and is Copyright 2002-2008 by John Cowan.
+
+TagSoup is licensed under the Apache License,
+Version 2.0. You may obtain a copy of this license at
+http://www.apache.org/licenses/LICENSE-2.0 . You may also have
+additional legal rights not granted by this license.
+
+TagSoup is distributed in the hope that it will be useful, but
+unless required by applicable law or agreed to in writing, TagSoup
+is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, either express or implied; not even the implied warranty
+of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for Additional Codecs code. ==
+ =========================================================================
+
+Additional Codecs
+These files are Copyright 2003-2010 VisualOn, but released under
+the Apache2 License.
+
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Audio Effects code. ==
+ =========================================================================
+
+Audio Effects
+These files are Copyright (C) 2004-2010 NXP Software and
+Copyright (C) 2010 The Android Open Source Project, but released under
+the Apache2 License.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+
+
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+and http://www.unicode.org/cldr/data/ . Unicode Software includes any
+source code published in the Unicode Standard or under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA
+FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY
+ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF
+THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY,
+DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2008 Unicode, Inc. All rights reserved. Distributed
+under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation (the
+"Data Files") or Unicode software and any associated documentation (the
+"Software") to deal in the Data Files or Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, and/or sell copies of the Data Files or Software,
+and to permit persons to whom the Data Files or Software are furnished to
+do so, provided that (a) the above copyright notice(s) and this permission
+notice appear with all copies of the Data Files or Software, (b) both the
+above copyright notice(s) and this permission notice appear in associated
+documentation, and (c) there is clear notice in each modified Data File
+or in the Software as well as in the documentation associated with the
+Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
diff --git a/audiod/Android.mk b/audiod/Android.mk
index 8633959..c89b3cd 100644
--- a/audiod/Android.mk
+++ b/audiod/Android.mk
@@ -26,7 +26,4 @@
LOCAL_MODULE:= audiod
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
diff --git a/configs/apq8098_latv/apq8098_latv.mk b/configs/apq8098_latv/apq8098_latv.mk
index 2853c3a..7079ea7 100644
--- a/configs/apq8098_latv/apq8098_latv.mk
+++ b/configs/apq8098_latv/apq8098_latv.mk
@@ -119,7 +119,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
endif
# Listen configuration file
diff --git a/configs/atoll/atoll.mk b/configs/atoll/atoll.mk
index 6e5a786..3432cdc 100644
--- a/configs/atoll/atoll.mk
+++ b/configs/atoll/atoll.mk
@@ -179,7 +179,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Reduce client buffer size for fast audio output tracks
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/common/bluetooth_qti_audio_policy_configuration.xml b/configs/common/bluetooth_qti_audio_policy_configuration.xml
new file mode 100644
index 0000000..f0b2506
--- /dev/null
+++ b/configs/common/bluetooth_qti_audio_policy_configuration.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
+<module name="bluetooth_qti" halVersion="2.0">
+ <mixPorts>
+ <!-- A2DP Audio Ports -->
+ <mixPort name="a2dp output" role="source"/>
+ <!-- Hearing AIDs Audio Ports -->
+ <mixPort name="hearing aid output" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="24000,16000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </mixPort>
+ </mixPorts>
+ <devicePorts>
+ <!-- A2DP Audio Ports -->
+ <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="44100,48000,88200,96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </devicePort>
+ <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="44100,48000,88200,96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </devicePort>
+ <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="44100,48000,88200,96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ </devicePort>
+ <!-- Hearing AIDs Audio Ports -->
+ <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
+ </devicePorts>
+ <routes>
+ <route type="mix" sink="BT A2DP Out"
+ sources="a2dp output"/>
+ <route type="mix" sink="BT A2DP Headphones"
+ sources="a2dp output"/>
+ <route type="mix" sink="BT A2DP Speaker"
+ sources="a2dp output"/>
+ <route type="mix" sink="BT Hearing Aid Out"
+ sources="hearing aid output"/>
+ </routes>
+</module>
diff --git a/configs/kona/kona.mk b/configs/kona/kona.mk
index e9b79de..46f6e5b 100644
--- a/configs/kona/kona.mk
+++ b/configs/kona/kona.mk
@@ -197,7 +197,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Reduce client buffer size for fast audio output tracks
PRODUCT_PROPERTY_OVERRIDES += \
@@ -444,6 +445,15 @@
vendor.qti.hardware.audiohalext@1.0-impl \
vendor.qti.hardware.audiohalext-utils
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+ android.hardware.audio@5.0 \
+ android.hardware.audio.common@5.0 \
+ android.hardware.audio.common@5.0-util \
+ android.hardware.audio@5.0-impl \
+ android.hardware.audio.effect@5.0 \
+ android.hardware.audio.effect@5.0-impl
+
PRODUCT_PACKAGES_ENG += \
VoicePrintTest \
VoicePrintDemo
diff --git a/configs/lito/lito.mk b/configs/lito/lito.mk
index 107e0b8..45258f0 100644
--- a/configs/lito/lito.mk
+++ b/configs/lito/lito.mk
@@ -190,7 +190,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Reduce client buffer size for fast audio output tracks
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msm8909/msm8909.mk b/configs/msm8909/msm8909.mk
index 4b9e935..b5cc947 100644
--- a/configs/msm8909/msm8909.mk
+++ b/configs/msm8909/msm8909.mk
@@ -90,7 +90,7 @@
endif
PRODUCT_COPY_FILES += \
$(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
diff --git a/configs/msm8937/msm8937.mk b/configs/msm8937/msm8937.mk
index 1730357..72fa6f3 100644
--- a/configs/msm8937/msm8937.mk
+++ b/configs/msm8937/msm8937.mk
@@ -107,7 +107,7 @@
endif
PRODUCT_COPY_FILES += \
$(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
diff --git a/configs/msm8953/msm8953.mk b/configs/msm8953/msm8953.mk
index 7715dd0..25d42cf 100644
--- a/configs/msm8953/msm8953.mk
+++ b/configs/msm8953/msm8953.mk
@@ -117,7 +117,7 @@
endif
PRODUCT_COPY_FILES += \
$(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
diff --git a/configs/msm8996/msm8996.mk b/configs/msm8996/msm8996.mk
index 58b72ee..c4e2fce 100644
--- a/configs/msm8996/msm8996.mk
+++ b/configs/msm8996/msm8996.mk
@@ -93,7 +93,7 @@
endif
PRODUCT_COPY_FILES += \
$(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index 9eb9d79..bee32c8 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -113,7 +113,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
endif
# Listen configuration file
diff --git a/configs/msmnile/msmnile.mk b/configs/msmnile/msmnile.mk
index 4662113..ae79cd6 100644
--- a/configs/msmnile/msmnile.mk
+++ b/configs/msmnile/msmnile.mk
@@ -189,7 +189,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Listen configuration file
PRODUCT_COPY_FILES += \
@@ -480,6 +481,15 @@
vendor.qti.hardware.audiohalext@1.0-impl \
vendor.qti.hardware.audiohalext-utils
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+ android.hardware.audio@5.0 \
+ android.hardware.audio.common@5.0 \
+ android.hardware.audio.common@5.0-util \
+ android.hardware.audio@5.0-impl \
+ android.hardware.audio.effect@5.0 \
+ android.hardware.audio.effect@5.0-impl
+
PRODUCT_PACKAGES_ENG += \
VoicePrintTest \
VoicePrintDemo
diff --git a/configs/msmnile_au/mixer_paths_adp.xml b/configs/msmnile_au/mixer_paths_adp.xml
index 78f815a..b07e235 100644
--- a/configs/msmnile_au/mixer_paths_adp.xml
+++ b/configs/msmnile_au/mixer_paths_adp.xml
@@ -70,7 +70,6 @@
<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_4_TX" 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" />
@@ -159,32 +158,9 @@
<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="SLIM_2_RX Format" value="UNPACKED" />
- <ctl name="SLIM_2_RX SampleRate" value="KHZ_48" />
- <ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="SLIM_5_RX Channels" value="One" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="SLIM_2_RX Channels" value="One" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX4" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX3" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX2" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX0" 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="VI_FEED_TX Channels" value="Two" />
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
- <ctl name="SLIM_4_TX Format" value="UNPACKED" />
<ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
<!-- HFP start -->
<ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
@@ -251,8 +227,6 @@
<!-- Voice external ec. reference -->
<ctl name="VOC_EXT_EC MUX" value="NONE" />
- <ctl name="AIF3_CAP Mixer SLIM TX1" value="0" />
- <ctl name="AIF3_CAP Mixer SLIM TX2" value="0" />
<!-- Voice external ec. reference end -->
<!-- RT Proxy Cal -->
@@ -295,12 +269,6 @@
<ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
<!-- audio record compress end-->
- <!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
- <ctl name="SLIM7_RX ADM Channels" value="Zero" />
- <!-- split a2dp end-->
-
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
<ctl name="SLIMBUS6_DL_HL Switch" value="0" />
@@ -322,228 +290,7 @@
<ctl name="SEC_TDM_RX_7 Port Mixer TERT_TDM_TX_7" value="1" />
</path>
- <!-- Codec controls -->
- <!-- WSA controls -->
- <ctl name="SpkrLeft COMP Switch" value="0" />
- <ctl name="SpkrRight COMP Switch" value="0" />
- <ctl name="SpkrLeft BOOST Switch" value="0" />
- <ctl name="SpkrRight BOOST Switch" value="0" />
- <ctl name="SpkrLeft VISENSE Switch" value="0" />
- <ctl name="SpkrRight VISENSE Switch" value="0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_0_DB" />
-
- <!-- Volume controls -->
- <ctl name="LINEOUT1 Volume" value="13" />
- <ctl name="LINEOUT2 Volume" value="13" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
- <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />
-
- <ctl name="RX0 Digital Volume" value="84" />
- <ctl name="RX1 Digital Volume" value="84" />
- <ctl name="RX2 Digital Volume" value="84" />
- <ctl name="RX3 Digital Volume" value="84" />
- <ctl name="RX4 Digital Volume" value="84" />
- <ctl name="RX5 Digital Volume" value="84" />
- <ctl name="RX6 Digital Volume" value="84" />
- <ctl name="RX7 Digital Volume" value="84" />
- <ctl name="ADC1 Volume" value="12" />
- <ctl name="ADC2 Volume" value="12" />
- <ctl name="ADC3 Volume" value="0" />
- <ctl name="ADC4 Volume" value="0" />
- <ctl name="DEC0 Volume" value="84" />
- <ctl name="DEC1 Volume" value="84" />
- <ctl name="DEC2 Volume" value="84" />
- <ctl name="DEC3 Volume" value="84" />
- <ctl name="DEC4 Volume" value="84" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
-
- <!-- Compander controls -->
- <ctl name="COMP1 Switch" value="1" />
- <ctl name="COMP2 Switch" value="1" />
- <ctl name="COMP7 Switch" value="0" />
- <ctl name="COMP8 Switch" value="0" />
-
- <!-- ADC, DMIC and AMIC controls -->
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="ADC MUX1" value="AMIC" />
- <ctl name="ADC MUX2" value="AMIC" />
- <ctl name="ADC MUX3" value="AMIC" />
- <ctl name="ADC MUX4" value="AMIC" />
- <ctl name="ADC MUX5" value="AMIC" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="ADC MUX11" value="AMIC" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="ADC MUX13" value="AMIC" />
- <ctl name="DMIC MUX0" value="ZERO" />
- <ctl name="DMIC MUX1" value="ZERO" />
- <ctl name="DMIC MUX2" value="ZERO" />
- <ctl name="DMIC MUX3" value="ZERO" />
- <ctl name="DMIC MUX4" value="ZERO" />
- <ctl name="DMIC MUX5" value="ZERO" />
- <ctl name="DMIC MUX6" value="ZERO" />
- <ctl name="DMIC MUX7" value="ZERO" />
- <ctl name="DMIC MUX8" value="ZERO" />
- <ctl name="DMIC MUX10" value="ZERO" />
- <ctl name="DMIC MUX11" value="ZERO" />
- <ctl name="DMIC MUX12" value="ZERO" />
- <ctl name="DMIC MUX13" value="ZERO" />
- <ctl name="AMIC MUX0" value="ZERO" />
- <ctl name="AMIC MUX1" value="ZERO" />
- <ctl name="AMIC MUX2" value="ZERO" />
- <ctl name="AMIC MUX3" value="ZERO" />
- <ctl name="AMIC MUX4" value="ZERO" />
- <ctl name="AMIC MUX5" value="ZERO" />
- <ctl name="AMIC MUX6" value="ZERO" />
- <ctl name="AMIC MUX7" value="ZERO" />
- <ctl name="AMIC MUX8" value="ZERO" />
- <ctl name="AMIC MUX10" value="ZERO" />
- <ctl name="AMIC MUX11" value="ZERO" />
- <ctl name="AMIC MUX12" value="ZERO" />
- <ctl name="AMIC MUX13" value="ZERO" />
-
- <ctl name="AMIC4_5 SEL" value="AMIC4" />
- <!-- CDC_IF and SLIM controls -->
- <ctl name="SLIM RX0 MUX" value="ZERO" />
- <ctl name="SLIM RX1 MUX" value="ZERO" />
- <ctl name="SLIM RX2 MUX" value="ZERO" />
- <ctl name="SLIM RX3 MUX" value="ZERO" />
- <ctl name="SLIM RX4 MUX" value="ZERO" />
- <ctl name="SLIM RX5 MUX" value="ZERO" />
- <ctl name="SLIM RX6 MUX" value="ZERO" />
- <ctl name="SLIM RX7 MUX" value="ZERO" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="CDC_IF RX2 MUX" value="SLIM RX2" />
- <ctl name="CDC_IF RX3 MUX" value="SLIM RX3" />
- <ctl name="CDC_IF RX4 MUX" value="SLIM RX4" />
- <ctl name="CDC_IF RX5 MUX" value="SLIM RX5" />
- <ctl name="CDC_IF RX6 MUX" value="SLIM RX6" />
- <ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
- <ctl name="CDC_IF TX0 MUX" value="ZERO" />
- <ctl name="CDC_IF TX1 MUX" value="ZERO" />
- <ctl name="CDC_IF TX2 MUX" value="ZERO" />
- <ctl name="CDC_IF TX3 MUX" value="ZERO" />
- <ctl name="CDC_IF TX4 MUX" value="ZERO" />
- <ctl name="CDC_IF TX5 MUX" value="ZERO" />
- <ctl name="CDC_IF TX6 MUX" value="ZERO" />
- <ctl name="CDC_IF TX7 MUX" value="ZERO" />
- <ctl name="CDC_IF TX8 MUX" value="ZERO" />
- <ctl name="CDC_IF TX9 MUX" value="ZERO" />
- <ctl name="CDC_IF TX10 MUX" value="ZERO" />
- <ctl name="CDC_IF TX13 MUX" value="ZERO" />
-
- <!-- Interpolator chain controls -->
- <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT0_2 MUX" value="ZERO" />
- <ctl name="RX INT1_2 MUX" value="ZERO" />
- <ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name="RX INT7_2 MUX" value="ZERO" />
- <ctl name="RX INT8_2 MUX" value="ZERO" />
- <ctl name="RX INT1_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT1_2 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_2 NATIVE MUX" value="OFF" />
- <ctl name="ASRC0 MUX" value="ZERO" />
- <ctl name="ASRC1 MUX" value="ZERO" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="0" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="0" />
- <ctl name="DSD_L IF MUX" value="ZERO" />
- <ctl name="DSD_R IF MUX" value="ZERO" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="0" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="0" />
- <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
-
- <!-- Headphone Default mode - uLP -->
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
- <ctl name="ASRC0 Output Mode" value="INT" />
- <ctl name="ASRC1 Output Mode" value="INT" />
-
- <!-- IIR/voice anc -->
- <ctl name="IIR0 Band1" id ="0" value="268435456" />
- <ctl name="IIR0 Band1" id ="1" value="0" />
- <ctl name="IIR0 Band1" id ="2" value="0" />
- <ctl name="IIR0 Band1" id ="3" value="0" />
- <ctl name="IIR0 Band1" id ="4" value="0" />
- <ctl name="IIR0 Band2" id ="0" value="268435456" />
- <ctl name="IIR0 Band2" id ="1" value="0" />
- <ctl name="IIR0 Band2" id ="2" value="0" />
- <ctl name="IIR0 Band2" id ="3" value="0" />
- <ctl name="IIR0 Band2" id ="4" value="0" />
- <ctl name="IIR0 Band3" id ="0" value="268435456" />
- <ctl name="IIR0 Band3" id ="1" value="0" />
- <ctl name="IIR0 Band3" id ="2" value="0" />
- <ctl name="IIR0 Band3" id ="3" value="0" />
- <ctl name="IIR0 Band3" id ="4" value="0" />
- <ctl name="IIR0 Band4" id ="0" value="268435456" />
- <ctl name="IIR0 Band4" id ="1" value="0" />
- <ctl name="IIR0 Band4" id ="2" value="0" />
- <ctl name="IIR0 Band4" id ="3" value="0" />
- <ctl name="IIR0 Band4" id ="4" value="0" />
- <ctl name="IIR0 Band5" id ="0" value="268435456" />
- <ctl name="IIR0 Band5" id ="1" value="0" />
- <ctl name="IIR0 Band5" id ="2" value="0" />
- <ctl name="IIR0 Band5" id ="3" value="0" />
- <ctl name="IIR0 Band5" id ="4" value="0" />
- <ctl name="IIR0 Enable Band1" value="0" />
- <ctl name="IIR0 Enable Band2" value="0" />
- <ctl name="IIR0 Enable Band3" value="0" />
- <ctl name="IIR0 Enable Band4" value="0" />
- <ctl name="IIR0 Enable Band5" value="0" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="IIR0 INP0 MUX" value="ZERO" />
- <ctl name="IIR0 INP1 MUX" value="ZERO" />
- <ctl name="IIR0 INP2 MUX" value="ZERO" />
- <ctl name="IIR1 INP0 MUX" value="ZERO" />
- <ctl name="IIR1 INP1 MUX" value="ZERO" />
- <ctl name="IIR1 INP2 MUX" value="ZERO" />
-
- <!-- anc related -->
- <ctl name="ANC Slot" value="0" />
- <ctl name="ANC Function" value="OFF" />
- <ctl name="ANC0 FB MUX" value="ZERO" />
- <ctl name="ANC1 FB MUX" value="ZERO" />
- <ctl name="ANC OUT EAR Enable Switch" value="0" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="0" />
- <ctl name="ANC SPKR PA Enable Switch" value="0" />
- <ctl name="ANC OUT HPHL Enable Switch" value="0" />
- <ctl name="ANC OUT HPHR Enable Switch" value="0" />
-
- <!-- Codec controls end -->
-
- <!-- mixer control to disable lowlatency qos voting -->
- <ctl name="MultiMedia5_RX QOS Vote" value="Disable" />
- <!-- mixer control to disable lowlatency qos voting end -->
-
<!-- These are audio route (FE to BE) specific mixer settings -->
- <path name="gsm-mode">
- <ctl name="GSM mode Enable" value="ON" />
- </path>
<!-- EC Reference -->
<ctl name="EC Reference Channels" value="Zero" />
@@ -568,7 +315,7 @@
</path>
<path name="multi-mic-echo-reference">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_TX_0 Channels" value="Six" />
<ctl name="MultiMedia2 Mixer SEC_TDM_TX_0" value="1" />
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0" />
@@ -1599,7 +1346,7 @@
</path>
<path name="icc-call">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
@@ -1823,121 +1570,38 @@
<!-- These are actual sound device specific mixer settings -->
<path name="amic1">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="AMIC MUX6" value="ADC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<path name="amic2">
- <ctl name="AIF1_CAP Mixer SLIM TX0" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX0 MUX" value="DEC0" />
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="AMIC MUX0" value="ADC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
</path>
<!-- For Tavil, DMIC numbered from 0 to 5 -->
<path name="dmic1">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic2">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic3">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic4">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC3" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic5">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC4" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic6">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="speaker">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-mono">
- <!-- ctl name="SLIM RX0 MUX" value="AIF1_PB" / -->
- <!-- ctl name="CDC_IF RX0 MUX" value="SLIM RX0" / -->
- <!-- ctl name="SLIM_0_RX Channels" value="One" / -->
- <!-- ctl name="RX INT7_1 MIX1 INP0" value="RX0" / -->
- <!-- ctl name="COMP7 Switch" value="1" / -->
- <!-- ctl name="SpkrLeft COMP Switch" value="1" / -->
- <!-- ctl name="SpkrLeft BOOST Switch" value="1" / -->
- <!-- ctl name="SpkrLeft VISENSE Switch" value="1" / -->
- <!-- ctl name="SpkrLeft SWR DAC_Port Switch" value="1" / -->
<ctl name="TERT_TDM_RX_0 Channels" value="One" />
</path>
<path name="speaker-mono-2">
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-qrd">
@@ -1963,24 +1627,14 @@
</path>
<path name="sidetone-iir">
- <ctl name="IIR0 Enable Band1" value="1" />
- <ctl name="IIR0 Enable Band2" value="1" />
- <ctl name="IIR0 Enable Band3" value="1" />
- <ctl name="IIR0 Enable Band4" value="1" />
- <ctl name="IIR0 Enable Band5" value="1" />
</path>
<path name="sidetone-headphones">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT1 MIX2 INP" value="SRC0" />
- <ctl name="RX INT2 MIX2 INP" value="SRC0" />
</path>
<path name="sidetone-handset">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT7 MIX2 INP" value="SRC0" />
</path>
<path name="afe-sidetone">
@@ -1999,29 +1653,15 @@
</path>
<path name="speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-2-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono-2" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="vi-feedback">
@@ -2034,23 +1674,9 @@
</path>
<path name="handset">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
</path>
<path name="handset-qrd">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
</path>
<path name="handset-mic">
@@ -2074,81 +1700,27 @@
</path>
<path name="three-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="anc-handset">
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="6" />
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="1" />
- <ctl name="ANC SPKR PA Enable Switch" value="1" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_6_DB" />
</path>
<path name="headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX4 MUX" value="AIF3_PB" />
- <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
- <ctl name="SLIM_5_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX5" />
- <ctl name="RX INT1_1 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_1 NATIVE MUX" value="ON" />
</path>
<path name="asrc-mode">
- <ctl name="ASRC0 Output Mode" value="FRAC" />
- <ctl name="ASRC1 Output Mode" value="FRAC" />
- <ctl name="RX INT1_2 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_2 NATIVE MUX" value="ON" />
- <ctl name="ASRC0 MUX" value="ASRC_IN_HPHL" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="1" />
- <ctl name="ASRC1 MUX" value="ASRC_IN_HPHR" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="1" />
</path>
<path name="headphones-dsd">
- <ctl name="SLIM RX6 MUX" value="AIF2_PB" />
- <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
- <ctl name="SLIM_2_RX Channels" value="Two" />
- <ctl name="DSD_L IF MUX" value="RX6" />
- <ctl name="DSD_R IF MUX" value="RX7" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="1" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="1" />
- <ctl name="SLIM_2_RX Format" value="DSD_DOP" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
</path>
<path name="hph-highquality-mode">
- <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
</path>
<path name="hph-lowpower-mode">
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
</path>
<path name="true-native-mode">
@@ -2254,27 +1826,6 @@
</path>
<path name="anc-headphones">
- <ctl name="COMP1 Switch" value="0" />
- <ctl name="COMP2 Switch" value="0" />
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="0" />
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
- <ctl name="RX1 Digital Volume" value="81" />
- <ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC OUT HPHL Enable Switch" value="1" />
- <ctl name="ANC OUT HPHR Enable Switch" value="1" />
</path>
<path name="speaker-and-anc-headphones">
@@ -2284,7 +1835,6 @@
<path name="anc-fb-headphones">
<path name="anc-headphones" />
- <ctl name="ANC Slot" value="1" />
</path>
<path name="speaker-and-anc-fb-headphones">
@@ -2344,62 +1894,24 @@
</path>
<path name="aanc-path">
- <ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
</path>
<path name="aanc-handset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="CDC_IF TX9 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<!-- Dual MIC devices -->
<path name="handset-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="speaker-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="dmic-endfire">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic-endfire-liquid">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="handset-stereo-dmic-ef">
@@ -2455,20 +1967,10 @@
</path>
<path name="speaker-dmic-broadside">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC2" />
</path>
<path name="dmic-broadside">
<path name="speaker-dmic-broadside" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="voice-speaker-dmic-broadside">
@@ -2477,23 +1979,6 @@
<!-- Quad MIC devices -->
<path name="speaker-qmic">
- <!-- ctl name="AIF1_CAP Mixer SLIM TX5" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX6" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX7" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX8" value="1" / -->
- <!-- ctl name="SLIM_0_TX Channels" value="Four" / -->
- <!-- ctl name="CDC_IF TX5 MUX" value="DEC5" / -->
- <!-- ctl name="ADC MUX5" value="DMIC" / -->
- <!-- ctl name="DMIC MUX5" value="DMIC1" / -->
- <!-- ctl name="CDC_IF TX6 MUX" value="DEC6" / -->
- <!-- ctl name="ADC MUX6" value="DMIC" / -->
- <!-- ctl name="DMIC MUX6" value="DMIC0" / -->
- <!-- ctl name="CDC_IF TX7 MUX" value="DEC7" / -->
- <!-- ctl name="ADC MUX7" value="DMIC" / -->
- <!-- ctl name="DMIC MUX7" value="DMIC2" / -->
- <!-- ctl name="CDC_IF TX8 MUX" value="DEC8" / -->
- <!-- ctl name="ADC MUX8" value="DMIC" / -->
- <!-- ctl name="DMIC MUX8" value="DMIC5" / -->
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
</path>
@@ -2520,9 +2005,6 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
</path>
<path name="voice-tty-full-headphones">
@@ -2552,7 +2034,6 @@
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
- <ctl name="ADC2 Volume" value="0" />
</path>
<path name="voice-tty-hco-headset-mic">
diff --git a/configs/msmnile_au/mixer_paths_custom.xml b/configs/msmnile_au/mixer_paths_custom.xml
index 774ec65..d8e45cd 100644
--- a/configs/msmnile_au/mixer_paths_custom.xml
+++ b/configs/msmnile_au/mixer_paths_custom.xml
@@ -70,7 +70,6 @@
<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_4_TX" 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" />
@@ -159,32 +158,9 @@
<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="SLIM_2_RX Format" value="UNPACKED" />
- <ctl name="SLIM_2_RX SampleRate" value="KHZ_48" />
- <ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="SLIM_5_RX Channels" value="One" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="SLIM_2_RX Channels" value="One" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX4" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX3" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX2" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX0" 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="VI_FEED_TX Channels" value="Two" />
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
- <ctl name="SLIM_4_TX Format" value="UNPACKED" />
<ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
<!-- HFP start -->
<ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
@@ -251,8 +227,6 @@
<!-- Voice external ec. reference -->
<ctl name="VOC_EXT_EC MUX" value="NONE" />
- <ctl name="AIF3_CAP Mixer SLIM TX1" value="0" />
- <ctl name="AIF3_CAP Mixer SLIM TX2" value="0" />
<!-- Voice external ec. reference end -->
<!-- RT Proxy Cal -->
@@ -295,12 +269,6 @@
<ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
<!-- audio record compress end-->
- <!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
- <ctl name="SLIM7_RX ADM Channels" value="Zero" />
- <!-- split a2dp end-->
-
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
<ctl name="SLIMBUS6_DL_HL Switch" value="0" />
@@ -318,228 +286,7 @@
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="0" />
<ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="0" />
- <!-- Codec controls -->
- <!-- WSA controls -->
- <ctl name="SpkrLeft COMP Switch" value="0" />
- <ctl name="SpkrRight COMP Switch" value="0" />
- <ctl name="SpkrLeft BOOST Switch" value="0" />
- <ctl name="SpkrRight BOOST Switch" value="0" />
- <ctl name="SpkrLeft VISENSE Switch" value="0" />
- <ctl name="SpkrRight VISENSE Switch" value="0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_0_DB" />
-
- <!-- Volume controls -->
- <ctl name="LINEOUT1 Volume" value="13" />
- <ctl name="LINEOUT2 Volume" value="13" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
- <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />
-
- <ctl name="RX0 Digital Volume" value="84" />
- <ctl name="RX1 Digital Volume" value="84" />
- <ctl name="RX2 Digital Volume" value="84" />
- <ctl name="RX3 Digital Volume" value="84" />
- <ctl name="RX4 Digital Volume" value="84" />
- <ctl name="RX5 Digital Volume" value="84" />
- <ctl name="RX6 Digital Volume" value="84" />
- <ctl name="RX7 Digital Volume" value="84" />
- <ctl name="ADC1 Volume" value="12" />
- <ctl name="ADC2 Volume" value="12" />
- <ctl name="ADC3 Volume" value="0" />
- <ctl name="ADC4 Volume" value="0" />
- <ctl name="DEC0 Volume" value="84" />
- <ctl name="DEC1 Volume" value="84" />
- <ctl name="DEC2 Volume" value="84" />
- <ctl name="DEC3 Volume" value="84" />
- <ctl name="DEC4 Volume" value="84" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
-
- <!-- Compander controls -->
- <ctl name="COMP1 Switch" value="1" />
- <ctl name="COMP2 Switch" value="1" />
- <ctl name="COMP7 Switch" value="0" />
- <ctl name="COMP8 Switch" value="0" />
-
- <!-- ADC, DMIC and AMIC controls -->
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="ADC MUX1" value="AMIC" />
- <ctl name="ADC MUX2" value="AMIC" />
- <ctl name="ADC MUX3" value="AMIC" />
- <ctl name="ADC MUX4" value="AMIC" />
- <ctl name="ADC MUX5" value="AMIC" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="ADC MUX11" value="AMIC" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="ADC MUX13" value="AMIC" />
- <ctl name="DMIC MUX0" value="ZERO" />
- <ctl name="DMIC MUX1" value="ZERO" />
- <ctl name="DMIC MUX2" value="ZERO" />
- <ctl name="DMIC MUX3" value="ZERO" />
- <ctl name="DMIC MUX4" value="ZERO" />
- <ctl name="DMIC MUX5" value="ZERO" />
- <ctl name="DMIC MUX6" value="ZERO" />
- <ctl name="DMIC MUX7" value="ZERO" />
- <ctl name="DMIC MUX8" value="ZERO" />
- <ctl name="DMIC MUX10" value="ZERO" />
- <ctl name="DMIC MUX11" value="ZERO" />
- <ctl name="DMIC MUX12" value="ZERO" />
- <ctl name="DMIC MUX13" value="ZERO" />
- <ctl name="AMIC MUX0" value="ZERO" />
- <ctl name="AMIC MUX1" value="ZERO" />
- <ctl name="AMIC MUX2" value="ZERO" />
- <ctl name="AMIC MUX3" value="ZERO" />
- <ctl name="AMIC MUX4" value="ZERO" />
- <ctl name="AMIC MUX5" value="ZERO" />
- <ctl name="AMIC MUX6" value="ZERO" />
- <ctl name="AMIC MUX7" value="ZERO" />
- <ctl name="AMIC MUX8" value="ZERO" />
- <ctl name="AMIC MUX10" value="ZERO" />
- <ctl name="AMIC MUX11" value="ZERO" />
- <ctl name="AMIC MUX12" value="ZERO" />
- <ctl name="AMIC MUX13" value="ZERO" />
-
- <ctl name="AMIC4_5 SEL" value="AMIC4" />
- <!-- CDC_IF and SLIM controls -->
- <ctl name="SLIM RX0 MUX" value="ZERO" />
- <ctl name="SLIM RX1 MUX" value="ZERO" />
- <ctl name="SLIM RX2 MUX" value="ZERO" />
- <ctl name="SLIM RX3 MUX" value="ZERO" />
- <ctl name="SLIM RX4 MUX" value="ZERO" />
- <ctl name="SLIM RX5 MUX" value="ZERO" />
- <ctl name="SLIM RX6 MUX" value="ZERO" />
- <ctl name="SLIM RX7 MUX" value="ZERO" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="CDC_IF RX2 MUX" value="SLIM RX2" />
- <ctl name="CDC_IF RX3 MUX" value="SLIM RX3" />
- <ctl name="CDC_IF RX4 MUX" value="SLIM RX4" />
- <ctl name="CDC_IF RX5 MUX" value="SLIM RX5" />
- <ctl name="CDC_IF RX6 MUX" value="SLIM RX6" />
- <ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
- <ctl name="CDC_IF TX0 MUX" value="ZERO" />
- <ctl name="CDC_IF TX1 MUX" value="ZERO" />
- <ctl name="CDC_IF TX2 MUX" value="ZERO" />
- <ctl name="CDC_IF TX3 MUX" value="ZERO" />
- <ctl name="CDC_IF TX4 MUX" value="ZERO" />
- <ctl name="CDC_IF TX5 MUX" value="ZERO" />
- <ctl name="CDC_IF TX6 MUX" value="ZERO" />
- <ctl name="CDC_IF TX7 MUX" value="ZERO" />
- <ctl name="CDC_IF TX8 MUX" value="ZERO" />
- <ctl name="CDC_IF TX9 MUX" value="ZERO" />
- <ctl name="CDC_IF TX10 MUX" value="ZERO" />
- <ctl name="CDC_IF TX13 MUX" value="ZERO" />
-
- <!-- Interpolator chain controls -->
- <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT0_2 MUX" value="ZERO" />
- <ctl name="RX INT1_2 MUX" value="ZERO" />
- <ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name="RX INT7_2 MUX" value="ZERO" />
- <ctl name="RX INT8_2 MUX" value="ZERO" />
- <ctl name="RX INT1_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT1_2 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_2 NATIVE MUX" value="OFF" />
- <ctl name="ASRC0 MUX" value="ZERO" />
- <ctl name="ASRC1 MUX" value="ZERO" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="0" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="0" />
- <ctl name="DSD_L IF MUX" value="ZERO" />
- <ctl name="DSD_R IF MUX" value="ZERO" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="0" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="0" />
- <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
-
- <!-- Headphone Default mode - uLP -->
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
- <ctl name="ASRC0 Output Mode" value="INT" />
- <ctl name="ASRC1 Output Mode" value="INT" />
-
- <!-- IIR/voice anc -->
- <ctl name="IIR0 Band1" id ="0" value="268435456" />
- <ctl name="IIR0 Band1" id ="1" value="0" />
- <ctl name="IIR0 Band1" id ="2" value="0" />
- <ctl name="IIR0 Band1" id ="3" value="0" />
- <ctl name="IIR0 Band1" id ="4" value="0" />
- <ctl name="IIR0 Band2" id ="0" value="268435456" />
- <ctl name="IIR0 Band2" id ="1" value="0" />
- <ctl name="IIR0 Band2" id ="2" value="0" />
- <ctl name="IIR0 Band2" id ="3" value="0" />
- <ctl name="IIR0 Band2" id ="4" value="0" />
- <ctl name="IIR0 Band3" id ="0" value="268435456" />
- <ctl name="IIR0 Band3" id ="1" value="0" />
- <ctl name="IIR0 Band3" id ="2" value="0" />
- <ctl name="IIR0 Band3" id ="3" value="0" />
- <ctl name="IIR0 Band3" id ="4" value="0" />
- <ctl name="IIR0 Band4" id ="0" value="268435456" />
- <ctl name="IIR0 Band4" id ="1" value="0" />
- <ctl name="IIR0 Band4" id ="2" value="0" />
- <ctl name="IIR0 Band4" id ="3" value="0" />
- <ctl name="IIR0 Band4" id ="4" value="0" />
- <ctl name="IIR0 Band5" id ="0" value="268435456" />
- <ctl name="IIR0 Band5" id ="1" value="0" />
- <ctl name="IIR0 Band5" id ="2" value="0" />
- <ctl name="IIR0 Band5" id ="3" value="0" />
- <ctl name="IIR0 Band5" id ="4" value="0" />
- <ctl name="IIR0 Enable Band1" value="0" />
- <ctl name="IIR0 Enable Band2" value="0" />
- <ctl name="IIR0 Enable Band3" value="0" />
- <ctl name="IIR0 Enable Band4" value="0" />
- <ctl name="IIR0 Enable Band5" value="0" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="IIR0 INP0 MUX" value="ZERO" />
- <ctl name="IIR0 INP1 MUX" value="ZERO" />
- <ctl name="IIR0 INP2 MUX" value="ZERO" />
- <ctl name="IIR1 INP0 MUX" value="ZERO" />
- <ctl name="IIR1 INP1 MUX" value="ZERO" />
- <ctl name="IIR1 INP2 MUX" value="ZERO" />
-
- <!-- anc related -->
- <ctl name="ANC Slot" value="0" />
- <ctl name="ANC Function" value="OFF" />
- <ctl name="ANC0 FB MUX" value="ZERO" />
- <ctl name="ANC1 FB MUX" value="ZERO" />
- <ctl name="ANC OUT EAR Enable Switch" value="0" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="0" />
- <ctl name="ANC SPKR PA Enable Switch" value="0" />
- <ctl name="ANC OUT HPHL Enable Switch" value="0" />
- <ctl name="ANC OUT HPHR Enable Switch" value="0" />
-
- <!-- Codec controls end -->
-
- <!-- mixer control to disable lowlatency qos voting -->
- <ctl name="MultiMedia5_RX QOS Vote" value="Disable" />
- <!-- mixer control to disable lowlatency qos voting end -->
-
<!-- These are audio route (FE to BE) specific mixer settings -->
- <path name="gsm-mode">
- <ctl name="GSM mode Enable" value="ON" />
- </path>
<!-- EC Reference -->
<ctl name="EC Reference Channels" value="Zero" />
@@ -564,7 +311,7 @@
</path>
<path name="multi-mic-echo-reference">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_TX_0 Channels" value="Six" />
<ctl name="MultiMedia2 Mixer SEC_TDM_TX_0" value="1" />
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0" />
@@ -1595,7 +1342,7 @@
</path>
<path name="icc-call">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
@@ -1819,121 +1566,38 @@
<!-- These are actual sound device specific mixer settings -->
<path name="amic1">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="AMIC MUX6" value="ADC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<path name="amic2">
- <ctl name="AIF1_CAP Mixer SLIM TX0" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX0 MUX" value="DEC0" />
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="AMIC MUX0" value="ADC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
</path>
<!-- For Tavil, DMIC numbered from 0 to 5 -->
<path name="dmic1">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic2">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic3">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic4">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC3" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic5">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC4" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic6">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="speaker">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-mono">
- <!-- ctl name="SLIM RX0 MUX" value="AIF1_PB" / -->
- <!-- ctl name="CDC_IF RX0 MUX" value="SLIM RX0" / -->
- <!-- ctl name="SLIM_0_RX Channels" value="One" / -->
- <!-- ctl name="RX INT7_1 MIX1 INP0" value="RX0" / -->
- <!-- ctl name="COMP7 Switch" value="1" / -->
- <!-- ctl name="SpkrLeft COMP Switch" value="1" / -->
- <!-- ctl name="SpkrLeft BOOST Switch" value="1" / -->
- <!-- ctl name="SpkrLeft VISENSE Switch" value="1" / -->
- <!-- ctl name="SpkrLeft SWR DAC_Port Switch" value="1" / -->
<ctl name="TERT_TDM_RX_0 Channels" value="One" />
</path>
<path name="speaker-mono-2">
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-qrd">
@@ -1959,24 +1623,14 @@
</path>
<path name="sidetone-iir">
- <ctl name="IIR0 Enable Band1" value="1" />
- <ctl name="IIR0 Enable Band2" value="1" />
- <ctl name="IIR0 Enable Band3" value="1" />
- <ctl name="IIR0 Enable Band4" value="1" />
- <ctl name="IIR0 Enable Band5" value="1" />
</path>
<path name="sidetone-headphones">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT1 MIX2 INP" value="SRC0" />
- <ctl name="RX INT2 MIX2 INP" value="SRC0" />
</path>
<path name="sidetone-handset">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT7 MIX2 INP" value="SRC0" />
</path>
<path name="afe-sidetone">
@@ -1995,29 +1649,15 @@
</path>
<path name="speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-2-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono-2" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="vi-feedback">
@@ -2030,23 +1670,9 @@
</path>
<path name="handset">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
</path>
<path name="handset-qrd">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
</path>
<path name="handset-mic">
@@ -2070,81 +1696,27 @@
</path>
<path name="three-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="anc-handset">
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="6" />
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="1" />
- <ctl name="ANC SPKR PA Enable Switch" value="1" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_6_DB" />
</path>
<path name="headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX4 MUX" value="AIF3_PB" />
- <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
- <ctl name="SLIM_5_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX5" />
- <ctl name="RX INT1_1 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_1 NATIVE MUX" value="ON" />
</path>
<path name="asrc-mode">
- <ctl name="ASRC0 Output Mode" value="FRAC" />
- <ctl name="ASRC1 Output Mode" value="FRAC" />
- <ctl name="RX INT1_2 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_2 NATIVE MUX" value="ON" />
- <ctl name="ASRC0 MUX" value="ASRC_IN_HPHL" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="1" />
- <ctl name="ASRC1 MUX" value="ASRC_IN_HPHR" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="1" />
</path>
<path name="headphones-dsd">
- <ctl name="SLIM RX6 MUX" value="AIF2_PB" />
- <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
- <ctl name="SLIM_2_RX Channels" value="Two" />
- <ctl name="DSD_L IF MUX" value="RX6" />
- <ctl name="DSD_R IF MUX" value="RX7" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="1" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="1" />
- <ctl name="SLIM_2_RX Format" value="DSD_DOP" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
</path>
<path name="hph-highquality-mode">
- <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
</path>
<path name="hph-lowpower-mode">
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
</path>
<path name="true-native-mode">
@@ -2250,27 +1822,6 @@
</path>
<path name="anc-headphones">
- <ctl name="COMP1 Switch" value="0" />
- <ctl name="COMP2 Switch" value="0" />
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="0" />
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
- <ctl name="RX1 Digital Volume" value="81" />
- <ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC OUT HPHL Enable Switch" value="1" />
- <ctl name="ANC OUT HPHR Enable Switch" value="1" />
</path>
<path name="speaker-and-anc-headphones">
@@ -2280,7 +1831,6 @@
<path name="anc-fb-headphones">
<path name="anc-headphones" />
- <ctl name="ANC Slot" value="1" />
</path>
<path name="speaker-and-anc-fb-headphones">
@@ -2340,62 +1890,24 @@
</path>
<path name="aanc-path">
- <ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
</path>
<path name="aanc-handset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="CDC_IF TX9 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<!-- Dual MIC devices -->
<path name="handset-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="speaker-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="dmic-endfire">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic-endfire-liquid">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="handset-stereo-dmic-ef">
@@ -2451,20 +1963,10 @@
</path>
<path name="speaker-dmic-broadside">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC2" />
</path>
<path name="dmic-broadside">
<path name="speaker-dmic-broadside" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="voice-speaker-dmic-broadside">
@@ -2473,23 +1975,6 @@
<!-- Quad MIC devices -->
<path name="speaker-qmic">
- <!-- ctl name="AIF1_CAP Mixer SLIM TX5" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX6" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX7" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX8" value="1" / -->
- <!-- ctl name="SLIM_0_TX Channels" value="Four" / -->
- <!-- ctl name="CDC_IF TX5 MUX" value="DEC5" / -->
- <!-- ctl name="ADC MUX5" value="DMIC" / -->
- <!-- ctl name="DMIC MUX5" value="DMIC1" / -->
- <!-- ctl name="CDC_IF TX6 MUX" value="DEC6" / -->
- <!-- ctl name="ADC MUX6" value="DMIC" / -->
- <!-- ctl name="DMIC MUX6" value="DMIC0" / -->
- <!-- ctl name="CDC_IF TX7 MUX" value="DEC7" / -->
- <!-- ctl name="ADC MUX7" value="DMIC" / -->
- <!-- ctl name="DMIC MUX7" value="DMIC2" / -->
- <!-- ctl name="CDC_IF TX8 MUX" value="DEC8" / -->
- <!-- ctl name="ADC MUX8" value="DMIC" / -->
- <!-- ctl name="DMIC MUX8" value="DMIC5" / -->
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
</path>
@@ -2516,9 +2001,6 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
</path>
<path name="voice-tty-full-headphones">
@@ -2548,7 +2030,6 @@
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
- <ctl name="ADC2 Volume" value="0" />
</path>
<path name="voice-tty-hco-headset-mic">
diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 5a7366f..c1b8630 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -104,7 +104,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Listen configuration file
PRODUCT_COPY_FILES += \
diff --git a/configs/msmsteppe/audio_platform_info_qrd.xml b/configs/msmsteppe/audio_platform_info_qrd.xml
index e02e9b3..bcda82f 100644
--- a/configs/msmsteppe/audio_platform_info_qrd.xml
+++ b/configs/msmsteppe/audio_platform_info_qrd.xml
@@ -92,6 +92,7 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" acdb_id="10"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" acdb_id="10"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="45"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>
<device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>
<device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>
<device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>
diff --git a/configs/msmsteppe/mixer_paths_idp.xml b/configs/msmsteppe/mixer_paths_idp.xml
index 860a253..a48defd 100644
--- a/configs/msmsteppe/mixer_paths_idp.xml
+++ b/configs/msmsteppe/mixer_paths_idp.xml
@@ -146,6 +146,7 @@
<!-- HFP end -->
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="None" />
<!-- usb headset -->
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -446,6 +447,22 @@
<ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
</path>
+ <path name="echo-reference-voip">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
+ </path>
+
+ <path name="echo-reference-voip headphones">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
+ </path>
+
+ <path name="echo-reference-voip display-port">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="DISPLAY_PORT" />
+ </path>
+
+ <path name="echo-reference-voip headphones-44.1">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/msmsteppe/mixer_paths_qrd.xml b/configs/msmsteppe/mixer_paths_qrd.xml
index 5efd1aa..53c91c3 100644
--- a/configs/msmsteppe/mixer_paths_qrd.xml
+++ b/configs/msmsteppe/mixer_paths_qrd.xml
@@ -145,6 +145,7 @@
<!-- HFP end -->
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="None" />
<!-- usb headset -->
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -434,6 +435,26 @@
<ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
</path>
+ <path name="echo-reference-voip">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
+ </path>
+
+ <path name="echo-reference-voip handset">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
+ </path>
+
+ <path name="echo-reference-voip headphones">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
+ </path>
+
+ <path name="echo-reference-voip display-port">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="DISPLAY_PORT" />
+ </path>
+
+ <path name="echo-reference-voip headphones-44.1">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/msmsteppe/mixer_paths_tavil.xml b/configs/msmsteppe/mixer_paths_tavil.xml
index e5723d1..1a2bf55 100644
--- a/configs/msmsteppe/mixer_paths_tavil.xml
+++ b/configs/msmsteppe/mixer_paths_tavil.xml
@@ -192,6 +192,7 @@
<!-- HFP end -->
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="None" />
<!-- usb headset -->
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -553,6 +554,18 @@
<path name="echo-reference headphones-44.1">
</path>
+ <path name="echo-reference-voip">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_RX" />
+ </path>
+
+ <path name="echo-reference-voip headphones">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
+ </path>
+
+ <path name="echo-reference-voip display-port">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="DISPLAY_PORT" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/msmsteppe/msmsteppe.mk b/configs/msmsteppe/msmsteppe.mk
index e35d6be..753a674 100644
--- a/configs/msmsteppe/msmsteppe.mk
+++ b/configs/msmsteppe/msmsteppe.mk
@@ -188,7 +188,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Listen configuration file
PRODUCT_COPY_FILES += \
diff --git a/configs/msmsteppe_au/mixer_paths_adp.xml b/configs/msmsteppe_au/mixer_paths_adp.xml
index 432f50c..e2de539 100644
--- a/configs/msmsteppe_au/mixer_paths_adp.xml
+++ b/configs/msmsteppe_au/mixer_paths_adp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. -->
<!-- -->
<!-- Redistribution and use in source and binary forms, with or without -->
<!-- modification, are permitted provided that the following conditions are -->
@@ -71,7 +71,6 @@
<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_4_TX" 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" />
@@ -160,32 +159,9 @@
<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="SLIM_2_RX Format" value="UNPACKED" />
- <ctl name="SLIM_2_RX SampleRate" value="KHZ_48" />
- <ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="SLIM_5_RX Channels" value="One" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="SLIM_2_RX Channels" value="One" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX4" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX3" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX2" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX0" 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="VI_FEED_TX Channels" value="Two" />
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
- <ctl name="SLIM_4_TX Format" value="UNPACKED" />
<ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
<!-- HFP start -->
<ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
@@ -252,8 +228,6 @@
<!-- Voice external ec. reference -->
<ctl name="VOC_EXT_EC MUX" value="NONE" />
- <ctl name="AIF3_CAP Mixer SLIM TX1" value="0" />
- <ctl name="AIF3_CAP Mixer SLIM TX2" value="0" />
<!-- Voice external ec. reference end -->
<!-- RT Proxy Cal -->
@@ -296,12 +270,6 @@
<ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
<!-- audio record compress end-->
- <!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
- <ctl name="SLIM7_RX ADM Channels" value="Zero" />
- <!-- split a2dp end-->
-
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
<ctl name="SLIMBUS6_DL_HL Switch" value="0" />
@@ -323,228 +291,7 @@
<ctl name="SEC_TDM_RX_7 Port Mixer TERT_TDM_TX_7" value="1" />
</path>
- <!-- Codec controls -->
- <!-- WSA controls -->
- <ctl name="SpkrLeft COMP Switch" value="0" />
- <ctl name="SpkrRight COMP Switch" value="0" />
- <ctl name="SpkrLeft BOOST Switch" value="0" />
- <ctl name="SpkrRight BOOST Switch" value="0" />
- <ctl name="SpkrLeft VISENSE Switch" value="0" />
- <ctl name="SpkrRight VISENSE Switch" value="0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_0_DB" />
-
- <!-- Volume controls -->
- <ctl name="LINEOUT1 Volume" value="13" />
- <ctl name="LINEOUT2 Volume" value="13" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
- <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />
-
- <ctl name="RX0 Digital Volume" value="84" />
- <ctl name="RX1 Digital Volume" value="84" />
- <ctl name="RX2 Digital Volume" value="84" />
- <ctl name="RX3 Digital Volume" value="84" />
- <ctl name="RX4 Digital Volume" value="84" />
- <ctl name="RX5 Digital Volume" value="84" />
- <ctl name="RX6 Digital Volume" value="84" />
- <ctl name="RX7 Digital Volume" value="84" />
- <ctl name="ADC1 Volume" value="12" />
- <ctl name="ADC2 Volume" value="12" />
- <ctl name="ADC3 Volume" value="0" />
- <ctl name="ADC4 Volume" value="0" />
- <ctl name="DEC0 Volume" value="84" />
- <ctl name="DEC1 Volume" value="84" />
- <ctl name="DEC2 Volume" value="84" />
- <ctl name="DEC3 Volume" value="84" />
- <ctl name="DEC4 Volume" value="84" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
-
- <!-- Compander controls -->
- <ctl name="COMP1 Switch" value="1" />
- <ctl name="COMP2 Switch" value="1" />
- <ctl name="COMP7 Switch" value="0" />
- <ctl name="COMP8 Switch" value="0" />
-
- <!-- ADC, DMIC and AMIC controls -->
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="ADC MUX1" value="AMIC" />
- <ctl name="ADC MUX2" value="AMIC" />
- <ctl name="ADC MUX3" value="AMIC" />
- <ctl name="ADC MUX4" value="AMIC" />
- <ctl name="ADC MUX5" value="AMIC" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="ADC MUX11" value="AMIC" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="ADC MUX13" value="AMIC" />
- <ctl name="DMIC MUX0" value="ZERO" />
- <ctl name="DMIC MUX1" value="ZERO" />
- <ctl name="DMIC MUX2" value="ZERO" />
- <ctl name="DMIC MUX3" value="ZERO" />
- <ctl name="DMIC MUX4" value="ZERO" />
- <ctl name="DMIC MUX5" value="ZERO" />
- <ctl name="DMIC MUX6" value="ZERO" />
- <ctl name="DMIC MUX7" value="ZERO" />
- <ctl name="DMIC MUX8" value="ZERO" />
- <ctl name="DMIC MUX10" value="ZERO" />
- <ctl name="DMIC MUX11" value="ZERO" />
- <ctl name="DMIC MUX12" value="ZERO" />
- <ctl name="DMIC MUX13" value="ZERO" />
- <ctl name="AMIC MUX0" value="ZERO" />
- <ctl name="AMIC MUX1" value="ZERO" />
- <ctl name="AMIC MUX2" value="ZERO" />
- <ctl name="AMIC MUX3" value="ZERO" />
- <ctl name="AMIC MUX4" value="ZERO" />
- <ctl name="AMIC MUX5" value="ZERO" />
- <ctl name="AMIC MUX6" value="ZERO" />
- <ctl name="AMIC MUX7" value="ZERO" />
- <ctl name="AMIC MUX8" value="ZERO" />
- <ctl name="AMIC MUX10" value="ZERO" />
- <ctl name="AMIC MUX11" value="ZERO" />
- <ctl name="AMIC MUX12" value="ZERO" />
- <ctl name="AMIC MUX13" value="ZERO" />
-
- <ctl name="AMIC4_5 SEL" value="AMIC4" />
- <!-- CDC_IF and SLIM controls -->
- <ctl name="SLIM RX0 MUX" value="ZERO" />
- <ctl name="SLIM RX1 MUX" value="ZERO" />
- <ctl name="SLIM RX2 MUX" value="ZERO" />
- <ctl name="SLIM RX3 MUX" value="ZERO" />
- <ctl name="SLIM RX4 MUX" value="ZERO" />
- <ctl name="SLIM RX5 MUX" value="ZERO" />
- <ctl name="SLIM RX6 MUX" value="ZERO" />
- <ctl name="SLIM RX7 MUX" value="ZERO" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="CDC_IF RX2 MUX" value="SLIM RX2" />
- <ctl name="CDC_IF RX3 MUX" value="SLIM RX3" />
- <ctl name="CDC_IF RX4 MUX" value="SLIM RX4" />
- <ctl name="CDC_IF RX5 MUX" value="SLIM RX5" />
- <ctl name="CDC_IF RX6 MUX" value="SLIM RX6" />
- <ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
- <ctl name="CDC_IF TX0 MUX" value="ZERO" />
- <ctl name="CDC_IF TX1 MUX" value="ZERO" />
- <ctl name="CDC_IF TX2 MUX" value="ZERO" />
- <ctl name="CDC_IF TX3 MUX" value="ZERO" />
- <ctl name="CDC_IF TX4 MUX" value="ZERO" />
- <ctl name="CDC_IF TX5 MUX" value="ZERO" />
- <ctl name="CDC_IF TX6 MUX" value="ZERO" />
- <ctl name="CDC_IF TX7 MUX" value="ZERO" />
- <ctl name="CDC_IF TX8 MUX" value="ZERO" />
- <ctl name="CDC_IF TX9 MUX" value="ZERO" />
- <ctl name="CDC_IF TX10 MUX" value="ZERO" />
- <ctl name="CDC_IF TX13 MUX" value="ZERO" />
-
- <!-- Interpolator chain controls -->
- <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT0_2 MUX" value="ZERO" />
- <ctl name="RX INT1_2 MUX" value="ZERO" />
- <ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name="RX INT7_2 MUX" value="ZERO" />
- <ctl name="RX INT8_2 MUX" value="ZERO" />
- <ctl name="RX INT1_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT1_2 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_2 NATIVE MUX" value="OFF" />
- <ctl name="ASRC0 MUX" value="ZERO" />
- <ctl name="ASRC1 MUX" value="ZERO" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="0" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="0" />
- <ctl name="DSD_L IF MUX" value="ZERO" />
- <ctl name="DSD_R IF MUX" value="ZERO" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="0" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="0" />
- <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
-
- <!-- Headphone Default mode - uLP -->
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
- <ctl name="ASRC0 Output Mode" value="INT" />
- <ctl name="ASRC1 Output Mode" value="INT" />
-
- <!-- IIR/voice anc -->
- <ctl name="IIR0 Band1" id ="0" value="268435456" />
- <ctl name="IIR0 Band1" id ="1" value="0" />
- <ctl name="IIR0 Band1" id ="2" value="0" />
- <ctl name="IIR0 Band1" id ="3" value="0" />
- <ctl name="IIR0 Band1" id ="4" value="0" />
- <ctl name="IIR0 Band2" id ="0" value="268435456" />
- <ctl name="IIR0 Band2" id ="1" value="0" />
- <ctl name="IIR0 Band2" id ="2" value="0" />
- <ctl name="IIR0 Band2" id ="3" value="0" />
- <ctl name="IIR0 Band2" id ="4" value="0" />
- <ctl name="IIR0 Band3" id ="0" value="268435456" />
- <ctl name="IIR0 Band3" id ="1" value="0" />
- <ctl name="IIR0 Band3" id ="2" value="0" />
- <ctl name="IIR0 Band3" id ="3" value="0" />
- <ctl name="IIR0 Band3" id ="4" value="0" />
- <ctl name="IIR0 Band4" id ="0" value="268435456" />
- <ctl name="IIR0 Band4" id ="1" value="0" />
- <ctl name="IIR0 Band4" id ="2" value="0" />
- <ctl name="IIR0 Band4" id ="3" value="0" />
- <ctl name="IIR0 Band4" id ="4" value="0" />
- <ctl name="IIR0 Band5" id ="0" value="268435456" />
- <ctl name="IIR0 Band5" id ="1" value="0" />
- <ctl name="IIR0 Band5" id ="2" value="0" />
- <ctl name="IIR0 Band5" id ="3" value="0" />
- <ctl name="IIR0 Band5" id ="4" value="0" />
- <ctl name="IIR0 Enable Band1" value="0" />
- <ctl name="IIR0 Enable Band2" value="0" />
- <ctl name="IIR0 Enable Band3" value="0" />
- <ctl name="IIR0 Enable Band4" value="0" />
- <ctl name="IIR0 Enable Band5" value="0" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="IIR0 INP0 MUX" value="ZERO" />
- <ctl name="IIR0 INP1 MUX" value="ZERO" />
- <ctl name="IIR0 INP2 MUX" value="ZERO" />
- <ctl name="IIR1 INP0 MUX" value="ZERO" />
- <ctl name="IIR1 INP1 MUX" value="ZERO" />
- <ctl name="IIR1 INP2 MUX" value="ZERO" />
-
- <!-- anc related -->
- <ctl name="ANC Slot" value="0" />
- <ctl name="ANC Function" value="OFF" />
- <ctl name="ANC0 FB MUX" value="ZERO" />
- <ctl name="ANC1 FB MUX" value="ZERO" />
- <ctl name="ANC OUT EAR Enable Switch" value="0" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="0" />
- <ctl name="ANC SPKR PA Enable Switch" value="0" />
- <ctl name="ANC OUT HPHL Enable Switch" value="0" />
- <ctl name="ANC OUT HPHR Enable Switch" value="0" />
-
- <!-- Codec controls end -->
-
- <!-- mixer control to disable lowlatency qos voting -->
- <ctl name="MultiMedia5_RX QOS Vote" value="Disable" />
- <!-- mixer control to disable lowlatency qos voting end -->
-
<!-- These are audio route (FE to BE) specific mixer settings -->
- <path name="gsm-mode">
- <ctl name="GSM mode Enable" value="ON" />
- </path>
<!-- EC Reference -->
<ctl name="EC Reference Channels" value="Zero" />
@@ -569,7 +316,7 @@
</path>
<path name="multi-mic-echo-reference">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_TX_0 Channels" value="Six" />
<ctl name="MultiMedia2 Mixer SEC_TDM_TX_0" value="1" />
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0" />
@@ -1600,7 +1347,7 @@
</path>
<path name="icc-call">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
@@ -1824,121 +1571,38 @@
<!-- These are actual sound device specific mixer settings -->
<path name="amic1">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="AMIC MUX6" value="ADC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<path name="amic2">
- <ctl name="AIF1_CAP Mixer SLIM TX0" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX0 MUX" value="DEC0" />
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="AMIC MUX0" value="ADC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
</path>
<!-- For Tavil, DMIC numbered from 0 to 5 -->
<path name="dmic1">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic2">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic3">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic4">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC3" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic5">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC4" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic6">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="speaker">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-mono">
- <!-- ctl name="SLIM RX0 MUX" value="AIF1_PB" / -->
- <!-- ctl name="CDC_IF RX0 MUX" value="SLIM RX0" / -->
- <!-- ctl name="SLIM_0_RX Channels" value="One" / -->
- <!-- ctl name="RX INT7_1 MIX1 INP0" value="RX0" / -->
- <!-- ctl name="COMP7 Switch" value="1" / -->
- <!-- ctl name="SpkrLeft COMP Switch" value="1" / -->
- <!-- ctl name="SpkrLeft BOOST Switch" value="1" / -->
- <!-- ctl name="SpkrLeft VISENSE Switch" value="1" / -->
- <!-- ctl name="SpkrLeft SWR DAC_Port Switch" value="1" / -->
<ctl name="TERT_TDM_RX_0 Channels" value="One" />
</path>
<path name="speaker-mono-2">
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-qrd">
@@ -1964,24 +1628,14 @@
</path>
<path name="sidetone-iir">
- <ctl name="IIR0 Enable Band1" value="1" />
- <ctl name="IIR0 Enable Band2" value="1" />
- <ctl name="IIR0 Enable Band3" value="1" />
- <ctl name="IIR0 Enable Band4" value="1" />
- <ctl name="IIR0 Enable Band5" value="1" />
</path>
<path name="sidetone-headphones">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT1 MIX2 INP" value="SRC0" />
- <ctl name="RX INT2 MIX2 INP" value="SRC0" />
</path>
<path name="sidetone-handset">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT7 MIX2 INP" value="SRC0" />
</path>
<path name="afe-sidetone">
@@ -2000,29 +1654,15 @@
</path>
<path name="speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-2-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono-2" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="vi-feedback">
@@ -2035,23 +1675,9 @@
</path>
<path name="handset">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
</path>
<path name="handset-qrd">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
</path>
<path name="handset-mic">
@@ -2075,81 +1701,27 @@
</path>
<path name="three-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="anc-handset">
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="6" />
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="1" />
- <ctl name="ANC SPKR PA Enable Switch" value="1" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_6_DB" />
</path>
<path name="headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX4 MUX" value="AIF3_PB" />
- <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
- <ctl name="SLIM_5_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX5" />
- <ctl name="RX INT1_1 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_1 NATIVE MUX" value="ON" />
</path>
<path name="asrc-mode">
- <ctl name="ASRC0 Output Mode" value="FRAC" />
- <ctl name="ASRC1 Output Mode" value="FRAC" />
- <ctl name="RX INT1_2 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_2 NATIVE MUX" value="ON" />
- <ctl name="ASRC0 MUX" value="ASRC_IN_HPHL" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="1" />
- <ctl name="ASRC1 MUX" value="ASRC_IN_HPHR" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="1" />
</path>
<path name="headphones-dsd">
- <ctl name="SLIM RX6 MUX" value="AIF2_PB" />
- <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
- <ctl name="SLIM_2_RX Channels" value="Two" />
- <ctl name="DSD_L IF MUX" value="RX6" />
- <ctl name="DSD_R IF MUX" value="RX7" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="1" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="1" />
- <ctl name="SLIM_2_RX Format" value="DSD_DOP" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
</path>
<path name="hph-highquality-mode">
- <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
</path>
<path name="hph-lowpower-mode">
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
</path>
<path name="true-native-mode">
@@ -2255,27 +1827,6 @@
</path>
<path name="anc-headphones">
- <ctl name="COMP1 Switch" value="0" />
- <ctl name="COMP2 Switch" value="0" />
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="0" />
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
- <ctl name="RX1 Digital Volume" value="81" />
- <ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC OUT HPHL Enable Switch" value="1" />
- <ctl name="ANC OUT HPHR Enable Switch" value="1" />
</path>
<path name="speaker-and-anc-headphones">
@@ -2285,7 +1836,6 @@
<path name="anc-fb-headphones">
<path name="anc-headphones" />
- <ctl name="ANC Slot" value="1" />
</path>
<path name="speaker-and-anc-fb-headphones">
@@ -2345,62 +1895,24 @@
</path>
<path name="aanc-path">
- <ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
</path>
<path name="aanc-handset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="CDC_IF TX9 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<!-- Dual MIC devices -->
<path name="handset-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="speaker-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="dmic-endfire">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic-endfire-liquid">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="handset-stereo-dmic-ef">
@@ -2456,20 +1968,10 @@
</path>
<path name="speaker-dmic-broadside">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC2" />
</path>
<path name="dmic-broadside">
<path name="speaker-dmic-broadside" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="voice-speaker-dmic-broadside">
@@ -2478,23 +1980,6 @@
<!-- Quad MIC devices -->
<path name="speaker-qmic">
- <!-- ctl name="AIF1_CAP Mixer SLIM TX5" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX6" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX7" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX8" value="1" / -->
- <!-- ctl name="SLIM_0_TX Channels" value="Four" / -->
- <!-- ctl name="CDC_IF TX5 MUX" value="DEC5" / -->
- <!-- ctl name="ADC MUX5" value="DMIC" / -->
- <!-- ctl name="DMIC MUX5" value="DMIC1" / -->
- <!-- ctl name="CDC_IF TX6 MUX" value="DEC6" / -->
- <!-- ctl name="ADC MUX6" value="DMIC" / -->
- <!-- ctl name="DMIC MUX6" value="DMIC0" / -->
- <!-- ctl name="CDC_IF TX7 MUX" value="DEC7" / -->
- <!-- ctl name="ADC MUX7" value="DMIC" / -->
- <!-- ctl name="DMIC MUX7" value="DMIC2" / -->
- <!-- ctl name="CDC_IF TX8 MUX" value="DEC8" / -->
- <!-- ctl name="ADC MUX8" value="DMIC" / -->
- <!-- ctl name="DMIC MUX8" value="DMIC5" / -->
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
</path>
@@ -2521,9 +2006,6 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
</path>
<path name="voice-tty-full-headphones">
@@ -2553,7 +2035,6 @@
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
- <ctl name="ADC2 Volume" value="0" />
</path>
<path name="voice-tty-hco-headset-mic">
diff --git a/configs/msmsteppe_au/mixer_paths_custom.xml b/configs/msmsteppe_au/mixer_paths_custom.xml
index f9257d2..3de6f0f 100644
--- a/configs/msmsteppe_au/mixer_paths_custom.xml
+++ b/configs/msmsteppe_au/mixer_paths_custom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. -->
<!-- -->
<!-- Redistribution and use in source and binary forms, with or without -->
<!-- modification, are permitted provided that the following conditions are -->
@@ -71,7 +71,6 @@
<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_4_TX" 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" />
@@ -160,32 +159,9 @@
<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="SLIM_2_RX Format" value="UNPACKED" />
- <ctl name="SLIM_2_RX SampleRate" value="KHZ_48" />
- <ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="SLIM_5_RX Channels" value="One" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="SLIM_2_RX Channels" value="One" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX4" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX3" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX2" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX0" 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="VI_FEED_TX Channels" value="Two" />
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
- <ctl name="SLIM_4_TX Format" value="UNPACKED" />
<ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
<!-- HFP start -->
<ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
@@ -252,8 +228,6 @@
<!-- Voice external ec. reference -->
<ctl name="VOC_EXT_EC MUX" value="NONE" />
- <ctl name="AIF3_CAP Mixer SLIM TX1" value="0" />
- <ctl name="AIF3_CAP Mixer SLIM TX2" value="0" />
<!-- Voice external ec. reference end -->
<!-- RT Proxy Cal -->
@@ -296,12 +270,6 @@
<ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
<!-- audio record compress end-->
- <!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
- <ctl name="SLIM7_RX ADM Channels" value="Zero" />
- <!-- split a2dp end-->
-
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
<ctl name="SLIMBUS6_DL_HL Switch" value="0" />
@@ -319,228 +287,7 @@
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="0" />
<ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="0" />
- <!-- Codec controls -->
- <!-- WSA controls -->
- <ctl name="SpkrLeft COMP Switch" value="0" />
- <ctl name="SpkrRight COMP Switch" value="0" />
- <ctl name="SpkrLeft BOOST Switch" value="0" />
- <ctl name="SpkrRight BOOST Switch" value="0" />
- <ctl name="SpkrLeft VISENSE Switch" value="0" />
- <ctl name="SpkrRight VISENSE Switch" value="0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_0_DB" />
-
- <!-- Volume controls -->
- <ctl name="LINEOUT1 Volume" value="13" />
- <ctl name="LINEOUT2 Volume" value="13" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
- <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />
-
- <ctl name="RX0 Digital Volume" value="84" />
- <ctl name="RX1 Digital Volume" value="84" />
- <ctl name="RX2 Digital Volume" value="84" />
- <ctl name="RX3 Digital Volume" value="84" />
- <ctl name="RX4 Digital Volume" value="84" />
- <ctl name="RX5 Digital Volume" value="84" />
- <ctl name="RX6 Digital Volume" value="84" />
- <ctl name="RX7 Digital Volume" value="84" />
- <ctl name="ADC1 Volume" value="12" />
- <ctl name="ADC2 Volume" value="12" />
- <ctl name="ADC3 Volume" value="0" />
- <ctl name="ADC4 Volume" value="0" />
- <ctl name="DEC0 Volume" value="84" />
- <ctl name="DEC1 Volume" value="84" />
- <ctl name="DEC2 Volume" value="84" />
- <ctl name="DEC3 Volume" value="84" />
- <ctl name="DEC4 Volume" value="84" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
-
- <!-- Compander controls -->
- <ctl name="COMP1 Switch" value="1" />
- <ctl name="COMP2 Switch" value="1" />
- <ctl name="COMP7 Switch" value="0" />
- <ctl name="COMP8 Switch" value="0" />
-
- <!-- ADC, DMIC and AMIC controls -->
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="ADC MUX1" value="AMIC" />
- <ctl name="ADC MUX2" value="AMIC" />
- <ctl name="ADC MUX3" value="AMIC" />
- <ctl name="ADC MUX4" value="AMIC" />
- <ctl name="ADC MUX5" value="AMIC" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="ADC MUX11" value="AMIC" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="ADC MUX13" value="AMIC" />
- <ctl name="DMIC MUX0" value="ZERO" />
- <ctl name="DMIC MUX1" value="ZERO" />
- <ctl name="DMIC MUX2" value="ZERO" />
- <ctl name="DMIC MUX3" value="ZERO" />
- <ctl name="DMIC MUX4" value="ZERO" />
- <ctl name="DMIC MUX5" value="ZERO" />
- <ctl name="DMIC MUX6" value="ZERO" />
- <ctl name="DMIC MUX7" value="ZERO" />
- <ctl name="DMIC MUX8" value="ZERO" />
- <ctl name="DMIC MUX10" value="ZERO" />
- <ctl name="DMIC MUX11" value="ZERO" />
- <ctl name="DMIC MUX12" value="ZERO" />
- <ctl name="DMIC MUX13" value="ZERO" />
- <ctl name="AMIC MUX0" value="ZERO" />
- <ctl name="AMIC MUX1" value="ZERO" />
- <ctl name="AMIC MUX2" value="ZERO" />
- <ctl name="AMIC MUX3" value="ZERO" />
- <ctl name="AMIC MUX4" value="ZERO" />
- <ctl name="AMIC MUX5" value="ZERO" />
- <ctl name="AMIC MUX6" value="ZERO" />
- <ctl name="AMIC MUX7" value="ZERO" />
- <ctl name="AMIC MUX8" value="ZERO" />
- <ctl name="AMIC MUX10" value="ZERO" />
- <ctl name="AMIC MUX11" value="ZERO" />
- <ctl name="AMIC MUX12" value="ZERO" />
- <ctl name="AMIC MUX13" value="ZERO" />
-
- <ctl name="AMIC4_5 SEL" value="AMIC4" />
- <!-- CDC_IF and SLIM controls -->
- <ctl name="SLIM RX0 MUX" value="ZERO" />
- <ctl name="SLIM RX1 MUX" value="ZERO" />
- <ctl name="SLIM RX2 MUX" value="ZERO" />
- <ctl name="SLIM RX3 MUX" value="ZERO" />
- <ctl name="SLIM RX4 MUX" value="ZERO" />
- <ctl name="SLIM RX5 MUX" value="ZERO" />
- <ctl name="SLIM RX6 MUX" value="ZERO" />
- <ctl name="SLIM RX7 MUX" value="ZERO" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="CDC_IF RX2 MUX" value="SLIM RX2" />
- <ctl name="CDC_IF RX3 MUX" value="SLIM RX3" />
- <ctl name="CDC_IF RX4 MUX" value="SLIM RX4" />
- <ctl name="CDC_IF RX5 MUX" value="SLIM RX5" />
- <ctl name="CDC_IF RX6 MUX" value="SLIM RX6" />
- <ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
- <ctl name="CDC_IF TX0 MUX" value="ZERO" />
- <ctl name="CDC_IF TX1 MUX" value="ZERO" />
- <ctl name="CDC_IF TX2 MUX" value="ZERO" />
- <ctl name="CDC_IF TX3 MUX" value="ZERO" />
- <ctl name="CDC_IF TX4 MUX" value="ZERO" />
- <ctl name="CDC_IF TX5 MUX" value="ZERO" />
- <ctl name="CDC_IF TX6 MUX" value="ZERO" />
- <ctl name="CDC_IF TX7 MUX" value="ZERO" />
- <ctl name="CDC_IF TX8 MUX" value="ZERO" />
- <ctl name="CDC_IF TX9 MUX" value="ZERO" />
- <ctl name="CDC_IF TX10 MUX" value="ZERO" />
- <ctl name="CDC_IF TX13 MUX" value="ZERO" />
-
- <!-- Interpolator chain controls -->
- <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT0_2 MUX" value="ZERO" />
- <ctl name="RX INT1_2 MUX" value="ZERO" />
- <ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name="RX INT7_2 MUX" value="ZERO" />
- <ctl name="RX INT8_2 MUX" value="ZERO" />
- <ctl name="RX INT1_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT1_2 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_2 NATIVE MUX" value="OFF" />
- <ctl name="ASRC0 MUX" value="ZERO" />
- <ctl name="ASRC1 MUX" value="ZERO" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="0" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="0" />
- <ctl name="DSD_L IF MUX" value="ZERO" />
- <ctl name="DSD_R IF MUX" value="ZERO" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="0" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="0" />
- <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
-
- <!-- Headphone Default mode - uLP -->
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
- <ctl name="ASRC0 Output Mode" value="INT" />
- <ctl name="ASRC1 Output Mode" value="INT" />
-
- <!-- IIR/voice anc -->
- <ctl name="IIR0 Band1" id ="0" value="268435456" />
- <ctl name="IIR0 Band1" id ="1" value="0" />
- <ctl name="IIR0 Band1" id ="2" value="0" />
- <ctl name="IIR0 Band1" id ="3" value="0" />
- <ctl name="IIR0 Band1" id ="4" value="0" />
- <ctl name="IIR0 Band2" id ="0" value="268435456" />
- <ctl name="IIR0 Band2" id ="1" value="0" />
- <ctl name="IIR0 Band2" id ="2" value="0" />
- <ctl name="IIR0 Band2" id ="3" value="0" />
- <ctl name="IIR0 Band2" id ="4" value="0" />
- <ctl name="IIR0 Band3" id ="0" value="268435456" />
- <ctl name="IIR0 Band3" id ="1" value="0" />
- <ctl name="IIR0 Band3" id ="2" value="0" />
- <ctl name="IIR0 Band3" id ="3" value="0" />
- <ctl name="IIR0 Band3" id ="4" value="0" />
- <ctl name="IIR0 Band4" id ="0" value="268435456" />
- <ctl name="IIR0 Band4" id ="1" value="0" />
- <ctl name="IIR0 Band4" id ="2" value="0" />
- <ctl name="IIR0 Band4" id ="3" value="0" />
- <ctl name="IIR0 Band4" id ="4" value="0" />
- <ctl name="IIR0 Band5" id ="0" value="268435456" />
- <ctl name="IIR0 Band5" id ="1" value="0" />
- <ctl name="IIR0 Band5" id ="2" value="0" />
- <ctl name="IIR0 Band5" id ="3" value="0" />
- <ctl name="IIR0 Band5" id ="4" value="0" />
- <ctl name="IIR0 Enable Band1" value="0" />
- <ctl name="IIR0 Enable Band2" value="0" />
- <ctl name="IIR0 Enable Band3" value="0" />
- <ctl name="IIR0 Enable Band4" value="0" />
- <ctl name="IIR0 Enable Band5" value="0" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="IIR0 INP0 MUX" value="ZERO" />
- <ctl name="IIR0 INP1 MUX" value="ZERO" />
- <ctl name="IIR0 INP2 MUX" value="ZERO" />
- <ctl name="IIR1 INP0 MUX" value="ZERO" />
- <ctl name="IIR1 INP1 MUX" value="ZERO" />
- <ctl name="IIR1 INP2 MUX" value="ZERO" />
-
- <!-- anc related -->
- <ctl name="ANC Slot" value="0" />
- <ctl name="ANC Function" value="OFF" />
- <ctl name="ANC0 FB MUX" value="ZERO" />
- <ctl name="ANC1 FB MUX" value="ZERO" />
- <ctl name="ANC OUT EAR Enable Switch" value="0" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="0" />
- <ctl name="ANC SPKR PA Enable Switch" value="0" />
- <ctl name="ANC OUT HPHL Enable Switch" value="0" />
- <ctl name="ANC OUT HPHR Enable Switch" value="0" />
-
- <!-- Codec controls end -->
-
- <!-- mixer control to disable lowlatency qos voting -->
- <ctl name="MultiMedia5_RX QOS Vote" value="Disable" />
- <!-- mixer control to disable lowlatency qos voting end -->
-
<!-- These are audio route (FE to BE) specific mixer settings -->
- <path name="gsm-mode">
- <ctl name="GSM mode Enable" value="ON" />
- </path>
<!-- EC Reference -->
<ctl name="EC Reference Channels" value="Zero" />
@@ -565,7 +312,7 @@
</path>
<path name="multi-mic-echo-reference">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_TX_0 Channels" value="Six" />
<ctl name="MultiMedia2 Mixer SEC_TDM_TX_0" value="1" />
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0" />
@@ -1596,7 +1343,7 @@
</path>
<path name="icc-call">
- <ctl name="TDM SampleRate" value="16000" />
+ <ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />
<ctl name="SEC_TDM_RX_0 Channels" value="Four" />
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
@@ -1820,121 +1567,38 @@
<!-- These are actual sound device specific mixer settings -->
<path name="amic1">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="AMIC MUX6" value="ADC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<path name="amic2">
- <ctl name="AIF1_CAP Mixer SLIM TX0" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX0 MUX" value="DEC0" />
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="AMIC MUX0" value="ADC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
</path>
<!-- For Tavil, DMIC numbered from 0 to 5 -->
<path name="dmic1">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic2">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic3">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic4">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC3" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic5">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC4" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic6">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="speaker">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-mono">
- <!-- ctl name="SLIM RX0 MUX" value="AIF1_PB" / -->
- <!-- ctl name="CDC_IF RX0 MUX" value="SLIM RX0" / -->
- <!-- ctl name="SLIM_0_RX Channels" value="One" / -->
- <!-- ctl name="RX INT7_1 MIX1 INP0" value="RX0" / -->
- <!-- ctl name="COMP7 Switch" value="1" / -->
- <!-- ctl name="SpkrLeft COMP Switch" value="1" / -->
- <!-- ctl name="SpkrLeft BOOST Switch" value="1" / -->
- <!-- ctl name="SpkrLeft VISENSE Switch" value="1" / -->
- <!-- ctl name="SpkrLeft SWR DAC_Port Switch" value="1" / -->
<ctl name="TERT_TDM_RX_0 Channels" value="One" />
</path>
<path name="speaker-mono-2">
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="COMP8 Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-qrd">
@@ -1960,24 +1624,14 @@
</path>
<path name="sidetone-iir">
- <ctl name="IIR0 Enable Band1" value="1" />
- <ctl name="IIR0 Enable Band2" value="1" />
- <ctl name="IIR0 Enable Band3" value="1" />
- <ctl name="IIR0 Enable Band4" value="1" />
- <ctl name="IIR0 Enable Band5" value="1" />
</path>
<path name="sidetone-headphones">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT1 MIX2 INP" value="SRC0" />
- <ctl name="RX INT2 MIX2 INP" value="SRC0" />
</path>
<path name="sidetone-handset">
<path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT7 MIX2 INP" value="SRC0" />
</path>
<path name="afe-sidetone">
@@ -1996,29 +1650,15 @@
</path>
<path name="speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="voice-speaker-2-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono-2" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<path name="vi-feedback">
@@ -2031,23 +1671,9 @@
</path>
<path name="handset">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="COMP7 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
</path>
<path name="handset-qrd">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
</path>
<path name="handset-mic">
@@ -2071,81 +1697,27 @@
</path>
<path name="three-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
</path>
<path name="anc-handset">
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="6" />
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="1" />
- <ctl name="ANC SPKR PA Enable Switch" value="1" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_6_DB" />
</path>
<path name="headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX4 MUX" value="AIF3_PB" />
- <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
- <ctl name="SLIM_5_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX5" />
- <ctl name="RX INT1_1 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_1 NATIVE MUX" value="ON" />
</path>
<path name="asrc-mode">
- <ctl name="ASRC0 Output Mode" value="FRAC" />
- <ctl name="ASRC1 Output Mode" value="FRAC" />
- <ctl name="RX INT1_2 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_2 NATIVE MUX" value="ON" />
- <ctl name="ASRC0 MUX" value="ASRC_IN_HPHL" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="1" />
- <ctl name="ASRC1 MUX" value="ASRC_IN_HPHR" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="1" />
</path>
<path name="headphones-dsd">
- <ctl name="SLIM RX6 MUX" value="AIF2_PB" />
- <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
- <ctl name="SLIM_2_RX Channels" value="Two" />
- <ctl name="DSD_L IF MUX" value="RX6" />
- <ctl name="DSD_R IF MUX" value="RX7" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="1" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="1" />
- <ctl name="SLIM_2_RX Format" value="DSD_DOP" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
</path>
<path name="hph-highquality-mode">
- <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
</path>
<path name="hph-lowpower-mode">
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
</path>
<path name="true-native-mode">
@@ -2251,27 +1823,6 @@
</path>
<path name="anc-headphones">
- <ctl name="COMP1 Switch" value="0" />
- <ctl name="COMP2 Switch" value="0" />
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="0" />
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
- <ctl name="RX1 Digital Volume" value="81" />
- <ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC OUT HPHL Enable Switch" value="1" />
- <ctl name="ANC OUT HPHR Enable Switch" value="1" />
</path>
<path name="speaker-and-anc-headphones">
@@ -2281,7 +1832,6 @@
<path name="anc-fb-headphones">
<path name="anc-headphones" />
- <ctl name="ANC Slot" value="1" />
</path>
<path name="speaker-and-anc-fb-headphones">
@@ -2341,62 +1891,24 @@
</path>
<path name="aanc-path">
- <ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
</path>
<path name="aanc-handset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="CDC_IF TX9 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<!-- Dual MIC devices -->
<path name="handset-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="speaker-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
</path>
<path name="dmic-endfire">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic-endfire-liquid">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="handset-stereo-dmic-ef">
@@ -2452,20 +1964,10 @@
</path>
<path name="speaker-dmic-broadside">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC2" />
</path>
<path name="dmic-broadside">
<path name="speaker-dmic-broadside" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="voice-speaker-dmic-broadside">
@@ -2474,23 +1976,6 @@
<!-- Quad MIC devices -->
<path name="speaker-qmic">
- <!-- ctl name="AIF1_CAP Mixer SLIM TX5" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX6" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX7" value="1" / -->
- <!-- ctl name="AIF1_CAP Mixer SLIM TX8" value="1" / -->
- <!-- ctl name="SLIM_0_TX Channels" value="Four" / -->
- <!-- ctl name="CDC_IF TX5 MUX" value="DEC5" / -->
- <!-- ctl name="ADC MUX5" value="DMIC" / -->
- <!-- ctl name="DMIC MUX5" value="DMIC1" / -->
- <!-- ctl name="CDC_IF TX6 MUX" value="DEC6" / -->
- <!-- ctl name="ADC MUX6" value="DMIC" / -->
- <!-- ctl name="DMIC MUX6" value="DMIC0" / -->
- <!-- ctl name="CDC_IF TX7 MUX" value="DEC7" / -->
- <!-- ctl name="ADC MUX7" value="DMIC" / -->
- <!-- ctl name="DMIC MUX7" value="DMIC2" / -->
- <!-- ctl name="CDC_IF TX8 MUX" value="DEC8" / -->
- <!-- ctl name="ADC MUX8" value="DMIC" / -->
- <!-- ctl name="DMIC MUX8" value="DMIC5" / -->
<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
</path>
@@ -2517,9 +2002,6 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
</path>
<path name="voice-tty-full-headphones">
@@ -2549,7 +2031,6 @@
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
- <ctl name="ADC2 Volume" value="0" />
</path>
<path name="voice-tty-hco-headset-mic">
diff --git a/configs/msmsteppe_au/msmsteppe_au.mk b/configs/msmsteppe_au/msmsteppe_au.mk
index 6edc7e0..87893a5 100644
--- a/configs/msmsteppe_au/msmsteppe_au.mk
+++ b/configs/msmsteppe_au/msmsteppe_au.mk
@@ -72,39 +72,40 @@
ifneq ($(strip $(TARGET_USES_RRO)), true)
#Audio Specific device overlays
-DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay
+DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
endif
PRODUCT_COPY_FILES += \
- hardware/qcom/audio/configs/msmsteppe_au/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
- hardware/qcom/audio/configs/msmsteppe_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
- hardware/qcom/audio/configs/msmsteppe_au/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
- hardware/qcom/audio/configs/msmsteppe_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \
- hardware/qcom/audio/configs/msmsteppe_au/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \
- hardware/qcom/audio/configs/msmsteppe_au/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
- hardware/qcom/audio/configs/msmsteppe_au/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \
- hardware/qcom/audio/configs/msmsteppe_au/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \
- hardware/qcom/audio/configs/msmsteppe_au/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \
- hardware/qcom/audio/configs/msmsteppe_au/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
- hardware/qcom/audio/configs/msmsteppe_au/mixer_paths_custom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_custom.xml \
- hardware/qcom/audio/configs/msmsteppe_au/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/mixer_paths_custom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_custom.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml
#XML Audio configuration files
ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
PRODUCT_COPY_FILES += \
- $(TOPDIR)hardware/qcom/audio/configs/msmsteppe_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml
endif
PRODUCT_COPY_FILES += \
- $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Listen configuration file
PRODUCT_COPY_FILES += \
- hardware/qcom/audio/configs/msmsteppe_au/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml
# Reduce client buffer size for fast audio output tracks
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/qssi/qssi.mk b/configs/qssi/qssi.mk
index 3a644e2..39569fb 100644
--- a/configs/qssi/qssi.mk
+++ b/configs/qssi/qssi.mk
@@ -103,11 +103,11 @@
vendor.audio.hw.aac.encoder=true
#audio becoming noisy intent broadcast delay
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
audio.sys.noisy.broadcast.delay=600
#offload pausetime out duration to 3 secs to inline with other outputs
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
audio.sys.offload.pstimeout.secs=3
#Set AudioFlinger client heap size
@@ -129,3 +129,19 @@
PRODUCT_PROPERTY_OVERRIDES += \
media.stagefright.audio.deep=false
+# for HIDL related packages
+PRODUCT_PACKAGES += \
+ android.hardware.audio@4.0 \
+ android.hardware.audio.common@4.0 \
+ android.hardware.audio.common@4.0-util \
+ android.hardware.audio.effect@4.0 \
+ vendor.qti.hardware.audiohalext@1.0 \
+ vendor.qti.hardware.audiohalext-utils
+
+PRODUCT_PACKAGES_ENG += \
+ VoicePrintTest \
+ VoicePrintDemo
+
+PRODUCT_PACKAGES_DEBUG += \
+ AudioSettings
+
diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk
index 1b60af4..84f0f1e 100644
--- a/configs/sdm660/sdm660.mk
+++ b/configs/sdm660/sdm660.mk
@@ -120,7 +120,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
endif
# Listen configuration file
diff --git a/configs/sdm710/sdm710.mk b/configs/sdm710/sdm710.mk
index 4d487b4..c47a146 100644
--- a/configs/sdm710/sdm710.mk
+++ b/configs/sdm710/sdm710.mk
@@ -184,7 +184,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
endif
# Listen configuration file
diff --git a/configs/sdm845/sdm845.mk b/configs/sdm845/sdm845.mk
index c4d5b54..4fb1485 100644
--- a/configs/sdm845/sdm845.mk
+++ b/configs/sdm845/sdm845.mk
@@ -138,7 +138,8 @@
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
endif
# Listen configuration file
diff --git a/configs/trinket/trinket.mk b/configs/trinket/trinket.mk
index 919c8c2..44babfa 100644
--- a/configs/trinket/trinket.mk
+++ b/configs/trinket/trinket.mk
@@ -74,41 +74,42 @@
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay
PRODUCT_COPY_FILES += \
- hardware/qcom/audio/configs/trinket/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
- hardware/qcom/audio/configs/trinket/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
- hardware/qcom/audio/configs/trinket/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
- hardware/qcom/audio/configs/trinket/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \
- hardware/qcom/audio/configs/trinket/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \
- hardware/qcom/audio/configs/trinket/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \
- hardware/qcom/audio/configs/trinket/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \
- hardware/qcom/audio/configs/trinket/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
- hardware/qcom/audio/configs/trinket/audio_platform_info_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_qrd.xml \
- hardware/qcom/audio/configs/trinket/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \
- hardware/qcom/audio/configs/trinket/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
- hardware/qcom/audio/configs/trinket/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_qrd.xml \
- hardware/qcom/audio/configs/trinket/sound_trigger_mixer_paths_wcd9335.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9335.xml \
- hardware/qcom/audio/configs/trinket/mixer_paths_idp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_idp.xml \
- hardware/qcom/audio/configs/trinket/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \
- hardware/qcom/audio/configs/trinket/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \
- hardware/qcom/audio/configs/trinket/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \
- hardware/qcom/audio/configs/trinket/mixer_paths_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tashalite.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_platform_info_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_qrd.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_qrd.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/sound_trigger_mixer_paths_wcd9335.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9335.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_idp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_idp.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tashalite.xml \
#XML Audio configuration files
ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
PRODUCT_COPY_FILES += \
- $(TOPDIR)hardware/qcom/audio/configs/trinket/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml
endif
PRODUCT_COPY_FILES += \
- $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
$(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+ $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml
# Listen configuration file
PRODUCT_COPY_FILES += \
- hardware/qcom/audio/configs/trinket/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml
+ vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml
# Reduce client buffer size for fast audio output tracks
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/hal/Android.mk b/hal/Android.mk
index 9c43730..0ce2d6e 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -358,9 +358,6 @@
LOCAL_VENDOR_MODULE := true
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
LOCAL_CFLAGS += -Wno-unused-variable
diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index 993c5cb..e944260 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -50,9 +50,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#--------------------------------------------
@@ -66,7 +63,7 @@
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 qcs605 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 qcs605 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -112,9 +109,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -127,7 +121,7 @@
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -174,9 +168,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
#include $(BUILD_SHARED_LIBRARY)
#--------------------------------------------
@@ -236,9 +227,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#--------------------------------------------
@@ -294,9 +282,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#====================================================================================================
# --- enable 3rd Party Spkr-prot lib
@@ -352,9 +337,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -368,7 +350,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -413,9 +395,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -431,7 +410,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -477,9 +456,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -493,7 +469,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -539,9 +515,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -555,7 +528,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -604,9 +577,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -620,7 +590,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -677,9 +647,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -693,7 +660,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM := msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -739,9 +706,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
#include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
@@ -755,7 +719,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona sdm660 msm8937 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona sdm660 msm8937 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM = msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -800,9 +764,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#-------------------------------------------
# Build AUDIOZOOM
@@ -815,7 +776,7 @@
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
-ifneq ($(filter sdm845 sdm710 msmnile kona sdm660 msm8937 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845 sdm710 msmnile kona sdm660 msm8937 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM = msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -860,9 +821,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index 429a2e3..1b197b2 100755
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -1738,7 +1738,7 @@
int ret = 0;
if (aptx_dsp_cfg == NULL || aptx_bt_cfg == NULL) {
- ALOGE("Invalid param, aptx_dsp_cfg %p aptx_bt_cfg %p",
+ ALOGE("Invalid param, aptx_dsp_cfg %pK aptx_bt_cfg %pK",
aptx_dsp_cfg, aptx_bt_cfg);
return -EINVAL;
}
@@ -1921,7 +1921,7 @@
int mixer_size = 0;
bool is_configured = false;
int ret = 0;
- int sample_rate_backup;
+ int sample_rate_backup = SAMPLING_RATE_48K;
if (aptx_bt_cfg == NULL)
return false;
@@ -1939,19 +1939,13 @@
if (a2dp.is_aptx_adaptive) {
aptx_ad_ctl = mixer_get_ctl_by_name(a2dp.adev->mixer,
MIXER_ENC_APTX_AD_CONFIG_BLOCK);
- if (aptx_ad_ctl) {
- mixer_size = sizeof(struct aptx_ad_enc_cfg_r2_t);
+ if (aptx_ad_ctl)
ret = update_aptx_ad_dsp_config_r2(&aptx_ad_dsp_cfg_r2, aptx_bt_cfg);
- } else {
- mixer_size = sizeof(struct aptx_ad_enc_cfg_t);
+ else
ret = update_aptx_ad_dsp_config(&aptx_ad_dsp_cfg, aptx_bt_cfg);
- }
- sample_rate_backup = aptx_ad_dsp_cfg.custom_cfg.sample_rate;
- } else {
- mixer_size = sizeof(struct aptx_enc_cfg_t);
- sample_rate_backup = aptx_bt_cfg->default_cfg->sampling_rate;
+ } else
ret = update_aptx_dsp_config_v2(&aptx_dsp_cfg, aptx_bt_cfg);
- }
+
if (ret) {
is_configured = false;
goto fail;
@@ -1960,13 +1954,13 @@
if (a2dp.is_aptx_adaptive) {
if (aptx_ad_ctl)
ret = mixer_ctl_set_array(aptx_ad_ctl, (void *)&aptx_ad_dsp_cfg_r2,
- mixer_size);
+ sizeof(struct aptx_ad_enc_cfg_r2_t));
else
ret = mixer_ctl_set_array(ctl_enc_data, (void *)&aptx_ad_dsp_cfg,
- mixer_size);
+ sizeof(struct aptx_ad_enc_cfg_t));
} else {
ret = mixer_ctl_set_array(ctl_enc_data, (void *)&aptx_dsp_cfg,
- mixer_size);
+ sizeof(struct aptx_enc_cfg_t));
}
#else
struct custom_enc_cfg_t aptx_dsp_cfg;
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 9691ce8..a5df951 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -93,6 +93,7 @@
#define MMAP_PLAYBACK_VOLUME_MAX 0x2000
#define PCM_PLAYBACK_VOLUME_MAX 0x2000
#define DSD_VOLUME_MIN_DB (-110)
+#define INVALID_OUT_VOLUME -1
#define RECORD_GAIN_MIN 0.0f
#define RECORD_GAIN_MAX 1.0f
@@ -779,6 +780,11 @@
(uc_id == USECASE_AUDIO_PLAYBACK_AFE_PROXY);
}
+static inline bool is_valid_volume(float left, float right)
+{
+ return ((left >= 0.0f && right >= 0.0f) ? true : false);
+}
+
static int enable_audio_route_for_voice_usecases(struct audio_device *adev,
struct audio_usecase *uc_info)
{
@@ -4820,6 +4826,12 @@
struct mixer_ctl *ctl;
long set_values[4];
+ if (!is_valid_volume(left, right)) {
+ ALOGE("%s: Invalid stream volume for left=%f, right=%f",
+ __func__, left, right);
+ return -EINVAL;
+ }
+
ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
if (!ctl) {
ALOGE("%s: Could not get ctl for mixer cmd - %s",
@@ -6980,6 +6992,8 @@
AUDIO_CHANNEL_OUT_MONO : AUDIO_CHANNEL_OUT_STEREO;
out->usecase = USECASE_AUDIO_PLAYBACK_VOIP;
out->format = AUDIO_FORMAT_PCM_16_BIT;
+ out->volume_l = INVALID_OUT_VOLUME;
+ out->volume_r = INVALID_OUT_VOLUME;
out->config = default_pcm_config_voip_copp;
out->config.period_size = VOIP_IO_BUF_SIZE(out->sample_rate, DEFAULT_VOIP_BUF_DURATION_MS, DEFAULT_VOIP_BIT_DEPTH_BYTE)/2;
diff --git a/hdmi_in_test/Android.mk b/hdmi_in_test/Android.mk
index 47b046a..d016cb3 100644
--- a/hdmi_in_test/Android.mk
+++ b/hdmi_in_test/Android.mk
@@ -18,7 +18,4 @@
LOCAL_STATIC_LIBRARIES += libprofile_rt
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk
index a15197a..5aa1f40 100644
--- a/mm-audio/aenc-aac/qdsp6/Android.mk
+++ b/mm-audio/aenc-aac/qdsp6/Android.mk
@@ -54,9 +54,6 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
# ---------------------------------------------------------------------------------
@@ -80,9 +77,6 @@
LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := test/omx_aac_enc_test.c
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
endif
diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk
index 75b4214..7e0007f 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Android.mk
+++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk
@@ -56,9 +56,6 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
# ---------------------------------------------------------------------------------
@@ -82,9 +79,6 @@
LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := test/omx_amr_enc_test.c
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
endif
diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk
index 00f4927..346ef81 100644
--- a/mm-audio/aenc-evrc/qdsp6/Android.mk
+++ b/mm-audio/aenc-evrc/qdsp6/Android.mk
@@ -56,9 +56,6 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
# ---------------------------------------------------------------------------------
@@ -81,9 +78,6 @@
LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := test/omx_evrc_enc_test.c
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
endif
diff --git a/mm-audio/aenc-g711/qdsp6/Android.mk b/mm-audio/aenc-g711/qdsp6/Android.mk
index 21c3d2b..8e4d9e7 100644
--- a/mm-audio/aenc-g711/qdsp6/Android.mk
+++ b/mm-audio/aenc-g711/qdsp6/Android.mk
@@ -58,9 +58,6 @@
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
@@ -85,9 +82,6 @@
LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := test/omx_g711_enc_test.c
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
endif
diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
index 1c844da..739ee82 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk
+++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
@@ -57,9 +57,6 @@
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
@@ -84,9 +81,6 @@
LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := test/omx_qcelp13_enc_test.c
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
endif
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 27c3037..6b1afd3 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -95,9 +95,6 @@
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
@@ -139,9 +136,6 @@
LOCAL_MODULE:= libhwacceffectswrapper
LOCAL_VENDOR_MODULE := true
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow
-endif
include $(BUILD_STATIC_LIBRARY)
endif
@@ -211,9 +205,6 @@
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
endif
@@ -247,9 +238,6 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/qahw/Android.mk b/qahw/Android.mk
index bd4ae53..a64b913 100644
--- a/qahw/Android.mk
+++ b/qahw/Android.mk
@@ -30,9 +30,6 @@
LOCAL_PRELINK_MODULE := false
LOCAL_VENDOR_MODULE := true
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
diff --git a/qahw_api/Android.mk b/qahw_api/Android.mk
index 253274a..1cad75d 100644
--- a/qahw_api/Android.mk
+++ b/qahw_api/Android.mk
@@ -42,9 +42,6 @@
LOCAL_PRELINK_MODULE := false
LOCAL_VENDOR_MODULE := true
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
#test app compilation
diff --git a/qahw_api/test/Android.mk b/qahw_api/test/Android.mk
index 8f8253d..cca72f8 100644
--- a/qahw_api/test/Android.mk
+++ b/qahw_api/test/Android.mk
@@ -31,9 +31,6 @@
LOCAL_C_INCLUDES += $(hal-play-inc)
LOCAL_VENDOR_MODULE := true
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
# audio_hal_multi_record_test
@@ -54,7 +51,4 @@
LOCAL_C_INCLUDES += $(hal-rec-inc)
LOCAL_VENDOR_MODULE := true
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_EXECUTABLE)
diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index 77eb085..dca016f 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -64,8 +64,5 @@
LOCAL_CFLAGS += -Wno-unused-function
LOCAL_CFLAGS += -Wno-unused-local-typedef
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
index e448b6f..56a3abd 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -50,8 +50,5 @@
LOCAL_CFLAGS += -Wno-unused-function
LOCAL_CFLAGS += -Wno-unused-local-typedef
-ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
-LOCAL_SANITIZE := integer_overflow
-endif
include $(BUILD_SHARED_LIBRARY)
endif