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

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

Promotion of audio-userspace.lnx.3.0-00022. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2018432   Iea9ce17bffd7f5157e6726041013fdd0f3799452   hal: Fix aanc-path selection on SDM660
1087755   Id159174d6ecf1424766d1471932d5403fd5ddc5e   hal : Modify the kernel buffer to 32ms.
2025747   I35670b3c0bf197ac80cc92c22bb73467e277a5cd   audio: hal: Avoid backend configuration for afe-proxy de
2046777   I27be499e61047f9615d3979c45c5d14d3b67af4d   configs: Disable Dolby on sdm845
2046777   I9579d58b7e95cc4ada50fc81b02a29f9604b831e   hal: fix compilation error after disabling Dolby

Change-Id: I4faae1e2689a8e6fd5b53a87bb29bf2186ed6281
CRs-Fixed: 2046777, 2025747, 1087755, 2018432
parents d2a7488a 18089936

configs/sdm845/sdm845.mk

+4 −4
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ AUDIO_FEATURE_ENABLED_HDMI_EDID := true 
AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

#AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true

AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true

AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := false

AUDIO_FEATURE_ENABLED_DEV_ARBI := false

MM_AUDIO_ENABLED_FTM := true

TARGET_USES_QCOM_MM_AUDIO := true
@@ -168,8 +168,8 @@ audio.offload.multiaac.enable=true 


#Enable DS2, Hardbypass feature for Dolby

PRODUCT_PROPERTY_OVERRIDES += \

audio.dolby.ds2.enabled=true\

audio.dolby.ds2.hardbypass=true

audio.dolby.ds2.enabled=false\

audio.dolby.ds2.hardbypass=false



#Disable Multiple offload sesison

PRODUCT_PROPERTY_OVERRIDES += \

hal/audio_extn/audio_extn.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ struct audio_extn_module { 
    bool hifi_audio_enabled;

    bool ras_enabled;

    struct aptx_dec_bt_addr addr;

    struct audio_device *adev;

};



static struct audio_extn_module aextnmod;
@@ -805,6 +806,7 @@ void audio_extn_init(struct audio_device *adev) 
    aextnmod.addr.nap = 0;

    aextnmod.addr.uap = 0;

    aextnmod.addr.lap = 0;

    aextnmod.adev = adev;



    audio_extn_dolby_set_license(adev);

    audio_extn_aptx_dec_set_license(adev);

hal/audio_extn/qaf.c

+233 −83

File changed.

Preview size limit exceeded, changes collapsed.

hal/msm8916/platform.c

+14 −5
Original line number Diff line number Diff line
@@ -5503,7 +5503,8 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev, 
    /*BT devices backend is not configured from HAL hence skip*/

    if (snd_device == SND_DEVICE_OUT_BT_A2DP ||

        snd_device == SND_DEVICE_OUT_BT_SCO ||

        snd_device == SND_DEVICE_OUT_BT_SCO_WB) {

        snd_device == SND_DEVICE_OUT_BT_SCO_WB ||

        snd_device == SND_DEVICE_OUT_AFE_PROXY) {

        backend_change = false;

        return backend_change;

    }
@@ -6829,11 +6830,19 @@ int platform_set_sidetone(struct audio_device *adev, 
    return 0;

}



void platform_update_aanc_path(struct audio_device *adev __unused,

                               snd_device_t out_snd_device __unused,

                               bool enable __unused,

                               char *str __unused)

void platform_update_aanc_path(struct audio_device *adev,

                               snd_device_t out_snd_device,

                               bool enable,

                               char *str)

{

    ALOGD("%s: aanc out device(%d) mixer cmd = %s, enable = %d\n",

          __func__, out_snd_device, str, enable);



    if (enable)

        audio_route_apply_and_update_path(adev->audio_route, str);

    else

        audio_route_reset_and_update_path(adev->audio_route, str);



   return;

}

hal/msm8974/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -5219,7 +5219,8 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev, 
    /*BT devices backend is not configured from HAL hence skip*/

    if (snd_device == SND_DEVICE_OUT_BT_A2DP ||

        snd_device == SND_DEVICE_OUT_BT_SCO ||

        snd_device == SND_DEVICE_OUT_BT_SCO_WB) {

        snd_device == SND_DEVICE_OUT_BT_SCO_WB ||

        snd_device == SND_DEVICE_OUT_AFE_PROXY) {

        backend_change = false;

        return backend_change;

    }