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

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

Merge 23160dc8 on remote branch 

Change-Id: I1a66a6f09b10c6130cf0e673d802a0cddd28aff9
parents ac13e82a 23160dc8

configs/atoll/atoll.mk

+68 −0
Original line number Diff line number Diff line
@@ -105,6 +105,70 @@ ifneq ($(strip $(TARGET_USES_RRO)), true) 
DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay

endif



ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)

BOARD_VENDOR_KERNEL_MODULES := \

    $(KERNEL_MODULES_OUT)/audio_apr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \

    $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \

    $(KERNEL_MODULES_OUT)/audio_q6.ko \

    $(KERNEL_MODULES_OUT)/audio_usf.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \

    $(KERNEL_MODULES_OUT)/audio_swr.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \

    $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \

    $(KERNEL_MODULES_OUT)/audio_platform.ko \

    $(KERNEL_MODULES_OUT)/audio_hdmi.ko \

    $(KERNEL_MODULES_OUT)/audio_stub.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \

    $(KERNEL_MODULES_OUT)/audio_mbhc.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd937x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd937x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_va_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_atoll.ko \

    $(KERNEL_MODULES_OUT)/audio_snd_event.ko

endif



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_q6_pdr.ko

AUDIO_DLKM += audio_q6_notifier.ko

AUDIO_DLKM += audio_adsp_loader.ko

AUDIO_DLKM += audio_q6.ko

AUDIO_DLKM += audio_usf.ko

AUDIO_DLKM += audio_pinctrl_lpi.ko

AUDIO_DLKM += audio_swr.ko

AUDIO_DLKM += audio_wcd_core.ko

AUDIO_DLKM += audio_swr_ctrl.ko

AUDIO_DLKM += audio_wsa881x.ko

AUDIO_DLKM += audio_platform.ko

AUDIO_DLKM += audio_hdmi.ko

AUDIO_DLKM += audio_stub.ko

AUDIO_DLKM += audio_wcd9xxx.ko

AUDIO_DLKM += audio_mbhc.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_wcd938x.ko

AUDIO_DLKM += audio_wcd938x_slave.ko

AUDIO_DLKM += audio_wcd937x.ko

AUDIO_DLKM += audio_wcd937x_slave.ko

AUDIO_DLKM += audio_bolero_cdc.ko

AUDIO_DLKM += audio_wsa_macro.ko

AUDIO_DLKM += audio_va_macro.ko

AUDIO_DLKM += audio_rx_macro.ko

AUDIO_DLKM += audio_tx_macro.ko

AUDIO_DLKM += audio_machine_atoll.ko

AUDIO_DLKM += audio_snd_event.ko



PRODUCT_PACKAGES += $(AUDIO_DLKM)



PRODUCT_COPY_FILES += \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/atoll/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/atoll/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
@@ -397,6 +461,10 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio.effect@5.0 \

    android.hardware.audio.effect@5.0-impl



# enable sound trigger hidl hal 2.2

PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.2-impl \



PRODUCT_PACKAGES_ENG += \

    VoicePrintTest \

    VoicePrintDemo

configs/atoll/audio_platform_info_qrd.xml

+14 −5
Original line number Diff line number Diff line
@@ -66,12 +66,13 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="36" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />

    </pcm_ids>

    <config_params>

        <!-- In the below value string, the value indicates default mono -->

        <!-- speaker. It can be set to either left or right              -->

        <param key="mono_speaker" value="right"/>

        <param key="spkr_2_tz_name" value="wsatz.14"/>

        <param key="mono_speaker" value="left"/>

        <param key="spkr_2_tz_name" value="wsatz.13"/>

        <param key="true_32_bit" value="true"/>

        <param key="native_audio_mode" value="multiple_mix_dsp"/>

        <param key="hfp_pcm_dev_id" value="39"/>
@@ -113,10 +114,13 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
@@ -165,10 +169,15 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" 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_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

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

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

        <device name="SND_DEVICE_IN_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

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

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

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="SLIMBUS_7_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="SLIMBUS_7_TX"/>

configs/atoll/audio_policy_configuration.xml

+1 −8
Original line number Diff line number Diff line
@@ -178,11 +178,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </mixPort>

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

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/>

                </mixPort>

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

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
@@ -361,9 +356,7 @@ 
                <route type="mix" sink="primary input"

                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>

                <route type="mix" sink="voip_tx"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>

                <route type="mix" sink="surround_sound"

                       sources="Built-In Mic,Built-In Back Mic"/>

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="usb_surround_sound"

                       sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="record_24"

configs/atoll/mixer_paths.xml

+720 −1

File changed.

Preview size limit exceeded, changes collapsed.

configs/atoll/mixer_paths_qrd.xml

+777 −46

File changed.

Preview size limit exceeded, changes collapsed.