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

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

Merge a5ec6113 on remote branch 

Change-Id: I823dcbccc5c9fbe5cb50b6fe565c48e7c6eff438
parents 4f62ca81 a5ec6113

configs/kona/kona.mk

+8 −0
Original line number Diff line number Diff line 
#BOARD_USES_GENERIC_AUDIO := true

#

#AUDIO_FEATURE_FLAGS

ifeq ($(TARGET_USES_QMAA_OVERRIDE_AUDIO), false)

ifeq ($(TARGET_USES_QMAA),true)

AUDIO_USE_STUB_HAL := true

endif

endif



ifneq ($(AUDIO_USE_STUB_HAL), true)

BOARD_USES_ALSA_AUDIO := true

TARGET_USES_AOSP_FOR_AUDIO := false
@@ -236,6 +243,7 @@ audio.volume.headset.gain.depcal=true 
#enable dualmic fluence for voice communication

PRODUCT_PROPERTY_OVERRIDES += \

persist.audio.fluence.voicecomm=true

endif



# for HIDL related packages

PRODUCT_PACKAGES += \

configs/msmnile/audio_platform_info.xml

+6 −0
Original line number Diff line number Diff line
@@ -145,6 +145,12 @@ 
        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="SLIMBUS_0_RX-and-SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX-and-SLIMBUS_7_RX"/>

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

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

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

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

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

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

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

configs/msmnile/mixer_paths_tavil.xml

+31 −6
Original line number Diff line number Diff line
@@ -1383,6 +1383,10 @@ 
        <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />

    </path>



    <path name="audio-record headset-mic">

        <ctl name="MultiMedia1 Mixer SLIM_1_TX" value="1" />

    </path>



    <path name="audio-record usb-headset-mic">

        <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="1" />

    </path>
@@ -1421,6 +1425,27 @@ 
        <ctl name="MultiMedia17 Mixer SLIM_0_TX" value="1" />

    </path>



    <path name="audio-record-compress2 headset-mic">

        <ctl name="MultiMedia17 Mixer SLIM_1_TX" value="1" />

    </path>



    <path name="audio-record-compress2 usb-headset-mic">

        <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="1" />

    </path>



    <path name="audio-record-compress2 bt-sco">

        <ctl name="MultiMedia17 Mixer SLIM_7_TX" value="1" />

    </path>



    <path name="audio-record-compress2 bt-sco-wb">

        <ctl name="BT SampleRate" value="KHZ_16" />

        <path name="audio-record-compress2 bt-sco" />

    </path>



    <path name="audio-record-compress2">

        <ctl name="MultiMedia17 Mixer SLIM_0_TX" value="1" />

    </path>



    <path name="audio-record-compress2 usb-headset-mic">

        <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="1" />

    </path>
@@ -1817,12 +1842,12 @@ 
    </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" />

        <ctl name="AIF3_CAP Mixer SLIM TX1" value="1"/>

        <ctl name="SLIM_1_TX Channels" value="One" />

        <ctl name="CDC_IF TX1 MUX" value="DEC1" />

        <ctl name="ADC MUX1" value="AMIC" />

        <ctl name="AMIC MUX1" value="ADC2" />

        <ctl name="IIR0 INP0 MUX" value="DEC1" />

    </path>



    <!-- For Tavil, DMIC numbered from 0 to 5 -->

configs/msmnile/msmnile.mk

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ BOARD_USES_ALSA_AUDIO := true 
TARGET_USES_AOSP_FOR_AUDIO := false



ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

USE_CUSTOM_AUDIO_POLICY := 0

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true

AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := true
@@ -42,6 +42,7 @@ AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true 
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true

AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

AUDIO_FEATURE_ENABLED_AHAL_EXT := true

DOLBY_ENABLE := false

endif

hal/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -333,6 +333,10 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_COMPRESS_INPUT)),true) 
    LOCAL_SRC_FILES += audio_extn/compress_in.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE)),true)

    LOCAL_CFLAGS += -DCONCURRENT_CAPTURE_ENABLED

endif



ifeq ($(strip $(BOARD_SUPPORTS_QAHW)),true)

    LOCAL_CFLAGS += -DAUDIO_HW_EXTN_API_ENABLED

    LOCAL_SRC_FILES += audio_hw_extn_api.c
@@ -355,7 +359,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libqti_vndfwk_detect \

    libhwbinder \

    libhidlbase \

    libhidltransport

    libhidltransport \

    libprocessgroup



LOCAL_C_INCLUDES += \

    external/tinyalsa/include \