Loading configs/lahaina/lahaina.mk +36 −1 Original line number Diff line number Diff line Loading @@ -16,8 +16,13 @@ SCRIPT := vendor/qcom/opensource/audio-hal/primary-hal/configs/common/mixer_xml_ $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/mixer_paths_base.xml --overlay $(OVERLAY_PATH)/mixer_paths_shimaidp_overlay.xml $(OVERLAY_PATH)/mixer_paths_shimaidps_overlay.xml $(OVERLAY_PATH)/mixer_paths_shimaqrd_overlay.xml --out_dir $(TARGET_PATH) --out mixer_paths_shimaidp.xml mixer_paths_shimaidps.xml mixer_paths_shimaqrd.xml ) $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/sound_trigger_mixer_paths_base.xml --overlay $(OVERLAY_PATH)/sound_trigger_mixer_paths_shimaidp_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_shimaidps_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_shimaqrd_overlay.xml --out_dir $(TARGET_PATH) --out sound_trigger_mixer_paths_shimaidp.xml sound_trigger_mixer_paths_shimaidps.xml sound_trigger_mixer_paths_shimaqrd.xml ) # OVERLAY_PATH := vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/yupik_overlay $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/mixer_paths_base.xml --overlay $(OVERLAY_PATH)/mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/mixer_paths_yupikqrd_overlay.xml --out_dir $(TARGET_PATH) --out mixer_paths_yupikidp.xml mixer_paths_yupikqrd.xml ) $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/sound_trigger_mixer_paths_base.xml --overlay $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikqrd_overlay.xml --out_dir $(TARGET_PATH) --out sound_trigger_mixer_paths_yupikidp.xml sound_trigger_mixer_paths_yupikqrd.xml ) # ifneq ($(AUDIO_USE_STUB_HAL), true) BOARD_USES_ALSA_AUDIO := true TARGET_USES_AOSP_FOR_AUDIO := false Loading Loading @@ -118,6 +123,8 @@ PRODUCT_PACKAGES += ftm_test_config_lahaina-hdk-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidp-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidps-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaqrd-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-yupikidp-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-yupikqrd-snd-card PRODUCT_PACKAGES += audioadsprpcd PRODUCT_PACKAGES += vendor.qti.audio-adsprpc-service.rc Loading Loading @@ -231,6 +238,34 @@ PRODUCT_COPY_FILES += \ $(foreach DEVICE_SKU, $(QCV_FAMILY_SKUS), \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)_qssi/audio_policy_configuration.xml) QCV_FAMILY_SKUS := yupik DEVICE_SKU := yupik PRODUCT_COPY_FILES += \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_io_policy.conf \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_effects.conf \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_effects.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_platform_info.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_intcodec.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidp.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikqrd.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikidp.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikqrd.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_tuning_mixer.txt \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_policy_volumes.xml #Copy generic APM XML file to common folder for runtime copy PRODUCT_COPY_FILES += \ vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_policy_configuration.xml # Audio configuration xml's common to yupik family PRODUCT_COPY_FILES += \ $(foreach DEVICE_SKU, $(QCV_FAMILY_SKUS), \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)_qssi/audio_policy_configuration.xml) # Low latency audio buffer size in frames PRODUCT_PROPERTY_OVERRIDES += \ vendor.audio_hal.period_size=192 Loading configs/lahaina/yupik_overlay/mixer_paths_yupikidp_overlay.xml 0 → 100644 +94 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer> <ctl name="TX DEC0 MUX" value="MSM_DMIC"/> <ctl name="TX DEC1 MUX" value="MSM_DMIC"/> <ctl name="TX DEC2 MUX" value="MSM_DMIC"/> <ctl name="TX DEC3 MUX" value="MSM_DMIC"/> <ctl name="TX DEC4 MUX" value="MSM_DMIC"/> <ctl name="TX DEC5 MUX" value="MSM_DMIC"/> <ctl name="TX DEC6 MUX" value="MSM_DMIC"/> <ctl name="TX DEC7 MUX" value="MSM_DMIC"/> <path name="speaker-mic"> <path name="dmic4"/> </path> <path name="speaker-mic-liquid"> <path name="dmic4"/> </path> <path name="handset-mic"> <path name="dmic1"/> </path> <path name="handset-dmic-endfire"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> </path> <path name="speaker-dmic-endfire"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC3"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> </path> <path name="speaker-dmic-broadside"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC3"/> </path> <path name="three-mic"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/> <ctl name="TX DMIC MUX3" value="DMIC4"/> </path> <path name="speaker-tmic"> <path name="three-mic" /> </path> <path name="speaker-qmic"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Four"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/> <ctl name="TX DMIC MUX3" value="DMIC3"/> <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/> <ctl name="TX DMIC MUX4" value="DMIC4"/> </path> <path name="voice-tty-vco-handset-mic"> <path name="dmic1"/> </path> </mixer> configs/lahaina/yupik_overlay/mixer_paths_yupikqrd_overlay.xml 0 → 100644 +28 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer/> No newline at end of file configs/lahaina/yupik_overlay/sound_trigger_mixer_paths_yupikidp_overlay.xml 0 → 100644 +83 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DEC2 MUX" value="MSM_DMIC"/> <ctl name="VA DEC3 MUX" value="MSM_DMIC"/> <ctl name="VA DEC4 MUX" value="MSM_DMIC"/> <ctl name="VA DEC5 MUX" value="MSM_DMIC"/> <ctl name="VA DEC6 MUX" value="MSM_DMIC"/> <ctl name="VA DEC7 MUX" value="MSM_DMIC"/> <ctl name="ADC1 ChMap" value="ZERO"/> <ctl name="ADC2 ChMap" value="ZERO"/> <ctl name="ADC3 ChMap" value="ZERO"/> <ctl name="ADC4 ChMap" value="ZERO"/> <path name="listen-ape-handset-mic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="One"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> </path> <path name="listen-ape-handset-dmic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> <ctl name="VA DMIC MUX1" value="DMIC1"/> </path> <path name="listen-ape-handset-tmic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DEC2 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> <ctl name="VA DMIC MUX1" value="DMIC2"/> <ctl name="VA DMIC MUX2" value="DMIC3"/> </path> <path name="listen-ape-handset-qmic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="Four"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC3" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DEC2 MUX" value="MSM_DMIC"/> <ctl name="VA DEC3 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> <ctl name="VA DMIC MUX1" value="DMIC1"/> <ctl name="VA DMIC MUX2" value="DMIC2"/> <ctl name="VA DMIC MUX3" value="DMIC3"/> </path> </mixer> configs/lahaina/yupik_overlay/sound_trigger_mixer_paths_yupikqrd_overlay.xml 0 → 100644 +28 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer/> No newline at end of file Loading
configs/lahaina/lahaina.mk +36 −1 Original line number Diff line number Diff line Loading @@ -16,8 +16,13 @@ SCRIPT := vendor/qcom/opensource/audio-hal/primary-hal/configs/common/mixer_xml_ $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/mixer_paths_base.xml --overlay $(OVERLAY_PATH)/mixer_paths_shimaidp_overlay.xml $(OVERLAY_PATH)/mixer_paths_shimaidps_overlay.xml $(OVERLAY_PATH)/mixer_paths_shimaqrd_overlay.xml --out_dir $(TARGET_PATH) --out mixer_paths_shimaidp.xml mixer_paths_shimaidps.xml mixer_paths_shimaqrd.xml ) $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/sound_trigger_mixer_paths_base.xml --overlay $(OVERLAY_PATH)/sound_trigger_mixer_paths_shimaidp_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_shimaidps_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_shimaqrd_overlay.xml --out_dir $(TARGET_PATH) --out sound_trigger_mixer_paths_shimaidp.xml sound_trigger_mixer_paths_shimaidps.xml sound_trigger_mixer_paths_shimaqrd.xml ) # OVERLAY_PATH := vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/yupik_overlay $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/mixer_paths_base.xml --overlay $(OVERLAY_PATH)/mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/mixer_paths_yupikqrd_overlay.xml --out_dir $(TARGET_PATH) --out mixer_paths_yupikidp.xml mixer_paths_yupikqrd.xml ) $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/sound_trigger_mixer_paths_base.xml --overlay $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikqrd_overlay.xml --out_dir $(TARGET_PATH) --out sound_trigger_mixer_paths_yupikidp.xml sound_trigger_mixer_paths_yupikqrd.xml ) # ifneq ($(AUDIO_USE_STUB_HAL), true) BOARD_USES_ALSA_AUDIO := true TARGET_USES_AOSP_FOR_AUDIO := false Loading Loading @@ -118,6 +123,8 @@ PRODUCT_PACKAGES += ftm_test_config_lahaina-hdk-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidp-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidps-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaqrd-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-yupikidp-snd-card PRODUCT_PACKAGES += ftm_test_config_lahaina-yupikqrd-snd-card PRODUCT_PACKAGES += audioadsprpcd PRODUCT_PACKAGES += vendor.qti.audio-adsprpc-service.rc Loading Loading @@ -231,6 +238,34 @@ PRODUCT_COPY_FILES += \ $(foreach DEVICE_SKU, $(QCV_FAMILY_SKUS), \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)_qssi/audio_policy_configuration.xml) QCV_FAMILY_SKUS := yupik DEVICE_SKU := yupik PRODUCT_COPY_FILES += \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_io_policy.conf \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_effects.conf \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_effects.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_platform_info.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_intcodec.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidp.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikqrd.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikidp.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikqrd.xml \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_tuning_mixer.txt \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_policy_volumes.xml #Copy generic APM XML file to common folder for runtime copy PRODUCT_COPY_FILES += \ vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_policy_configuration.xml # Audio configuration xml's common to yupik family PRODUCT_COPY_FILES += \ $(foreach DEVICE_SKU, $(QCV_FAMILY_SKUS), \ vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)_qssi/audio_policy_configuration.xml) # Low latency audio buffer size in frames PRODUCT_PROPERTY_OVERRIDES += \ vendor.audio_hal.period_size=192 Loading
configs/lahaina/yupik_overlay/mixer_paths_yupikidp_overlay.xml 0 → 100644 +94 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer> <ctl name="TX DEC0 MUX" value="MSM_DMIC"/> <ctl name="TX DEC1 MUX" value="MSM_DMIC"/> <ctl name="TX DEC2 MUX" value="MSM_DMIC"/> <ctl name="TX DEC3 MUX" value="MSM_DMIC"/> <ctl name="TX DEC4 MUX" value="MSM_DMIC"/> <ctl name="TX DEC5 MUX" value="MSM_DMIC"/> <ctl name="TX DEC6 MUX" value="MSM_DMIC"/> <ctl name="TX DEC7 MUX" value="MSM_DMIC"/> <path name="speaker-mic"> <path name="dmic4"/> </path> <path name="speaker-mic-liquid"> <path name="dmic4"/> </path> <path name="handset-mic"> <path name="dmic1"/> </path> <path name="handset-dmic-endfire"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> </path> <path name="speaker-dmic-endfire"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC3"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> </path> <path name="speaker-dmic-broadside"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC3"/> </path> <path name="three-mic"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/> <ctl name="TX DMIC MUX3" value="DMIC4"/> </path> <path name="speaker-tmic"> <path name="three-mic" /> </path> <path name="speaker-qmic"> <ctl name="TX_CDC_DMA_TX_3 Channels" value="Four"/> <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="TX DMIC MUX1" value="DMIC0"/> <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="TX DMIC MUX2" value="DMIC1"/> <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/> <ctl name="TX DMIC MUX3" value="DMIC3"/> <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/> <ctl name="TX DMIC MUX4" value="DMIC4"/> </path> <path name="voice-tty-vco-handset-mic"> <path name="dmic1"/> </path> </mixer>
configs/lahaina/yupik_overlay/mixer_paths_yupikqrd_overlay.xml 0 → 100644 +28 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer/> No newline at end of file
configs/lahaina/yupik_overlay/sound_trigger_mixer_paths_yupikidp_overlay.xml 0 → 100644 +83 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DEC2 MUX" value="MSM_DMIC"/> <ctl name="VA DEC3 MUX" value="MSM_DMIC"/> <ctl name="VA DEC4 MUX" value="MSM_DMIC"/> <ctl name="VA DEC5 MUX" value="MSM_DMIC"/> <ctl name="VA DEC6 MUX" value="MSM_DMIC"/> <ctl name="VA DEC7 MUX" value="MSM_DMIC"/> <ctl name="ADC1 ChMap" value="ZERO"/> <ctl name="ADC2 ChMap" value="ZERO"/> <ctl name="ADC3 ChMap" value="ZERO"/> <ctl name="ADC4 ChMap" value="ZERO"/> <path name="listen-ape-handset-mic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="One"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> </path> <path name="listen-ape-handset-dmic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> <ctl name="VA DMIC MUX1" value="DMIC1"/> </path> <path name="listen-ape-handset-tmic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DEC2 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> <ctl name="VA DMIC MUX1" value="DMIC2"/> <ctl name="VA DMIC MUX2" value="DMIC3"/> </path> <path name="listen-ape-handset-qmic"> <ctl name="VA_CDC_DMA_TX_0 Channels" value="Four"/> <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC2" value="1"/> <ctl name="VA_AIF1_CAP Mixer DEC3" value="1"/> <ctl name="VA DEC0 MUX" value="MSM_DMIC"/> <ctl name="VA DEC1 MUX" value="MSM_DMIC"/> <ctl name="VA DEC2 MUX" value="MSM_DMIC"/> <ctl name="VA DEC3 MUX" value="MSM_DMIC"/> <ctl name="VA DMIC MUX0" value="DMIC0"/> <ctl name="VA DMIC MUX1" value="DMIC1"/> <ctl name="VA DMIC MUX2" value="DMIC2"/> <ctl name="VA DMIC MUX3" value="DMIC3"/> </path> </mixer>
configs/lahaina/yupik_overlay/sound_trigger_mixer_paths_yupikqrd_overlay.xml 0 → 100644 +28 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="ISO-8859-1"?> <!--- Copyright (c) 2020, 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. --> <mixer/> No newline at end of file