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

Commit f2a07a93 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: handle CLANG errors for Dolby"

parents 5a0129ac 1f705a7d

configs/msm8937/msm8937.mk

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ MM_AUDIO_ENABLED_FTM := true 
MM_AUDIO_ENABLED_SAFX := true

TARGET_USES_QCOM_MM_AUDIO := true

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

##AUDIO_FEATURE_FLAGS

configs/msm8953/msm8953.mk

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ MM_AUDIO_ENABLED_FTM := true 
MM_AUDIO_ENABLED_SAFX := true

TARGET_USES_QCOM_MM_AUDIO := true

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true



AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

configs/msm8996/msm8996.mk

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ MM_AUDIO_ENABLED_FTM := true 
MM_AUDIO_ENABLED_SAFX := true

TARGET_USES_QCOM_MM_AUDIO := true

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

#DOLBY_DDP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true



AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true

configs/msmcobalt/msmcobalt.mk

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ 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

#DOLBY_DDP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true

hal/audio_extn/dolby.c

+6 −10
Original line number Diff line number Diff line
@@ -484,9 +484,7 @@ static struct ds2_extn_module ds2extnmod = { 
};



int audio_extn_dap_hal_init(int snd_card) {

    char c_dmid[128] = {0};

    void *handle = NULL;

    int i_dmid, ret = -EINVAL;

    int ret = -EINVAL;

    dap_hal_device_be_id_map_t device_be_id_map;



    ALOGV("%s: opening DAP HAL lib\n", __func__);
@@ -532,9 +530,7 @@ int audio_extn_dap_hal_deinit() { 
void audio_extn_dolby_ds2_set_endpoint(struct audio_device *adev) {

    struct listnode *node;

    struct audio_usecase *usecase;

    struct mixer_ctl *ctl;

    const char *mixer_ctl_name = "DS1 DAP Endpoint";

    int endpoint = 0, ret;

    int endpoint = 0;

    bool send = false;



    list_for_each(node, &adev->usecase_list) {
@@ -587,7 +583,7 @@ int audio_extn_ds2_enable(struct audio_device *adev) { 
    return 0;

}



int audio_extn_dolby_set_dap_bypass(struct audio_device *adev, int state) {

int audio_extn_dolby_set_dap_bypass(struct audio_device *adev __unused, int state) {



    ALOGV("%s: state %d", __func__, state);

    if (ds2extnmod.dap_hal_set_hw_info) {
@@ -599,12 +595,12 @@ int audio_extn_dolby_set_dap_bypass(struct audio_device *adev, int state) { 
    return 0;

}



void audio_extn_dolby_set_license(struct audio_device *adev)

void audio_extn_dolby_set_license(struct audio_device *adev __unused)

{

    int i_key=0;

    char c_key[128] = {0};

    char c_dmid[128] = {0};

    int i_dmid, ret = -EINVAL;

    int i_dmid;

    struct dolby_param_license dolby_license;



#ifdef DOLBY_ACDB_LICENSE
@@ -631,7 +627,7 @@ void audio_extn_dolby_set_license(struct audio_device *adev) 
void audio_extn_ds2_set_parameters(struct audio_device *adev,

                                   struct str_parms *parms)

{

    int val, ret;

    int ret;

    char value[32]={0};



    ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_SND_CARD_STATUS, value,