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

Commit 3c202d36 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 3948ce1a 45213c0e

configs/msm8952_32/msm8952_32.mk

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true 
MM_AUDIO_ENABLED_FTM := true

MM_AUDIO_ENABLED_SAFX := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

TARGET_USES_QCOM_MM_AUDIO := true

##AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := true

DTS_CODEC_M_ := true

configs/msm8952_64/msm8952_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true 
MM_AUDIO_ENABLED_FTM := true

MM_AUDIO_ENABLED_SAFX := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

TARGET_USES_QCOM_MM_AUDIO := true

#AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := true

DTS_CODEC_M_ := true

hal/audio_extn/dolby.c

+10 −14
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ void audio_extn_dolby_set_dmid(struct audio_device *adev) 
}



#ifndef DS2_DOLBY_DAP_ENABLED

void audio_extn_dolby_set_license(struct audio_device *adev)

void audio_extn_dolby_set_license(struct audio_device *adev __unused)

{

    int ret, key=0;

    char value[128] = {0};
@@ -634,9 +634,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__);
@@ -655,7 +653,7 @@ int audio_extn_dap_hal_init(int snd_card) { 
    ds2extnmod.dap_hal_set_hw_info(SND_CARD, (void*)(&snd_card));

    ALOGV("%s Sound card number is:%d",__func__,snd_card);



    platform_get_device_to_be_id_map(&device_be_id_map.device_id_to_be_id, &device_be_id_map.len);

    platform_get_device_to_be_id_map((int**)&device_be_id_map.device_id_to_be_id, &device_be_id_map.len);

    ds2extnmod.dap_hal_set_hw_info(DEVICE_BE_ID_MAP, (void*)(&device_be_id_map));

    ALOGV("%s Set be id map len:%d",__func__,device_be_id_map.len);

    ret = 0;
@@ -681,9 +679,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) {
@@ -736,7 +732,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) {
@@ -748,12 +744,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
@@ -772,16 +768,16 @@ void audio_extn_dolby_set_license(struct audio_device *adev) 
        ds2extnmod.dap_hal_set_hw_info(DMID, (void*)(&dolby_license.dmid));

    } else {

        ALOGV("%s: dap_hal_set_hw_info is NULL", __func__);

        return ret;

        return ;

    }

    return 0;

    return ;

}





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,

policy_hal/Android.mk

+18 −0
Original line number Diff line number Diff line 
# This file was modified by Dolby Laboratories, Inc. The portions of the

# code that are surrounded by "DOLBY..." are copyrighted and

# licensed separately, as follows:

#

# (C)  2016 Dolby Laboratories, Inc.

# All rights reserved.

#

# This program is protected under international and U.S. Copyright laws as

# an unpublished work. This program is confidential and proprietary to the

# copyright owners. Reproduction or disclosure, in whole or in part, or the

# production of derivative works therefrom without the express permission of

# the copyright owners is prohibited.

#

ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)

ifeq ($(USE_CUSTOM_AUDIO_POLICY), 1)

LOCAL_PATH := $(call my-dir)
@@ -62,6 +75,11 @@ endif 
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM_POWER_OPT)),true)

LOCAL_CFLAGS += -DFM_POWER_OPT

endif

# DOLBY_START

ifeq ($(strip $(DOLBY_ENABLE)),true)

LOCAL_CFLAGS += $(dolby_cflags)

endif

# DOLBY_END



ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF