Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbb20eac authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge f4a153e4 on remote branch 

Change-Id: I4fd80a43f29416e0fb9d761b4a2ac60ef4166894
parents d735ef7c f4a153e4

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ include $(MY_LOCAL_PATH)/visualizer/Android.mk 
include $(MY_LOCAL_PATH)/post_proc/Android.mk

include $(MY_LOCAL_PATH)/qahw/Android.mk

include $(MY_LOCAL_PATH)/qahw_api/Android.mk

ifeq ($(AUDIO_FEATURE_ENABLED_STT_SUPPORT),true)

include $(MY_LOCAL_PATH)/stt_meta/Android.mk

endif

endif



ifeq ($(USE_LEGACY_AUDIO_DAEMON), true)

configs/audio_vendor_product.mk

+15 −0
Original line number Diff line number Diff line 
AUDIO_USE_STUB_HAL := false

ifeq ($(TARGET_USES_QMAA),true)

ifeq ($(TARGET_USES_QMAA_OVERRIDE_AUDIO), false)

AUDIO_USE_STUB_HAL := true

endif # TARGET_USES_QMAA_OVERRIDE_AUDIO

endif # TARGET_USES_QMAA



#MM_AUDIO product packages

MM_AUDIO += audiod

MM_AUDIO += libacdbloader
@@ -119,6 +126,9 @@ MM_AUDIO += QRD_Hdmi_cal.acdb 
MM_AUDIO += QRD_Headset_cal.acdb

MM_AUDIO += QRD_Speaker_cal.acdb

MM_AUDIO += QRD_workspaceFile.qwsp

ifeq ($(TARGET_BOARD_PLATFORM),lahaina)

MM_AUDIO += fai__4.8.8_0.0__3.0.0_0.0__3.1.2_0.0__3.2.0_0.1__eai_1.10.pmd

endif

ifeq ($(TARGET_BOARD_AUTO),true)

MM_AUDIO += adsp_avs_config.acdb

MM_AUDIO += Bluetooth_cal.acdb
@@ -223,6 +233,10 @@ TARGET_USES_AOSP_FOR_AUDIO := false 
endif



# Audio configuration file

ifeq ($(AUDIO_USE_STUB_HAL),true)

TARGET_USES_AOSP_FOR_AUDIO := true

-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/default.mk

else

ifeq ($(TARGET_GVMGH_SPECIFIC), false)

-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/msmnile_au.mk

else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX),msmnile_au_km4)
@@ -232,6 +246,7 @@ else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATI 
else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX),sm6150_au)

-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/msmsteppe_au.mk

endif

endif # AUDIO_USE_STUB_HAL



ifeq ($(TARGET_BOARD_AUTO),true)

ifeq ($(TARGET_USES_RRO),true)

configs/common_au/audio_policy_configuration.xml

+6 −107
Original line number Diff line number Diff line
@@ -79,67 +79,16 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_media" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="sys_notification" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_8k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_16k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_24k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_32k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="mixport_tuner0" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000"

                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>

                </mixPort>

                <mixPort name="nav_guidance" role="source"

                         flags="AUDIO_OUTPUT_FLAG_PRIMARY">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_8k_navi" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_16k_navi" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_24k_navi" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_32k_navi" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_navi" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                <mixPort name="nav_guidance" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>
@@ -147,60 +96,10 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_8k_phone" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_16k_phone" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_24k_phone" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_32k_phone" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_phone" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="alerts" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_8k_alerts" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_16k_alerts" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_24k_alerts" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_32k_alerts" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_alerts" role="source"

                         flags="AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="front_passenger" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -424,15 +323,15 @@ 
            </devicePorts>

            <routes>

                <route type="mix" sink="Media Bus"

                       sources="media,mmap_no_irq_out,carplay_48k_media"/>

                       sources="media,mmap_no_irq_out"/>

                <route type="mix" sink="Sys Notification Bus"

                       sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys,mmap_no_irq_out"/>

                       sources="sys_notification,mmap_no_irq_out"/>

                <route type="mix" sink="Nav Guidance Bus"

                       sources="nav_guidance,mmap_no_irq_out,carplay_8k_navi,carplay_16k_navi,carplay_24k_navi,carplay_32k_navi,carplay_48k_navi"/>

                       sources="nav_guidance,mmap_no_irq_out"/>

                <route type="mix" sink="Phone Bus"

                       sources="phone,carplay_8k_phone,carplay_16k_phone,carplay_24k_phone,carplay_32k_phone,carplay_48k_phone,mmap_no_irq_out"/>

                       sources="phone,mmap_no_irq_out"/>

                <route type="mix" sink="Alerts Bus"

                       sources="alerts,carplay_8k_alerts,carplay_16k_alerts,carplay_24k_alerts,carplay_32k_alerts,carplay_48k_alerts"/>

                       sources="alerts"/>

                <route type="mix" sink="Front Passenger Bus"

                       sources="front_passenger,mmap_no_irq_out"/>

                <route type="mix" sink="Rear Seat Bus"

configs/lahaina/audio_platform_info_yupikidp.xml

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->

<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->

<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->

<!--                                                                        -->

<!-- Changes from Qualcomm Innovation Center are provided under the following license:-->

<!-- Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- SPDX-License-Identifier: BSD-3-Clause-Clear                            -->

<audio_platform_info>

    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>
@@ -223,6 +227,7 @@ 
        <device name="SND_DEVICE_IN_HANDSET_MIC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>
@@ -245,9 +250,11 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_MIC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_TMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>
@@ -299,6 +306,7 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

configs/lahaina/lahaina.mk

+7 −0
Original line number Diff line number Diff line
@@ -115,9 +115,13 @@ AUDIO_WRAPPER += libqahwwrapper 
AUDIO_HAL_TEST_APPS := hal_play_test

AUDIO_HAL_TEST_APPS += hal_rec_test



#STT META Test App

AUDIO_STT_META := stt_meta_extract



PRODUCT_PACKAGES += $(AUDIO_HARDWARE)

PRODUCT_PACKAGES += $(AUDIO_WRAPPER)

PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)

PRODUCT_PACKAGES += $(AUDIO_STT_META)

PRODUCT_PACKAGES += ftm_test_config_lahaina-qrd-snd-card

PRODUCT_PACKAGES += ftm_test_config_lahaina-hdk-snd-card

PRODUCT_PACKAGES += ftm_test_config_lahaina-hhg-snd-card
@@ -579,3 +583,6 @@ PRODUCT_PACKAGES_DEBUG += \ 
endif



AUDIO_FEATURE_ENABLED_GKI := true



#enable STT support

AUDIO_FEATURE_ENABLED_STT_SUPPORT := true