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

Commit 5539688e authored by Vignesh Kulothungan's avatar Vignesh Kulothungan Committed by Gerrit - the friendly Code Review server
Browse files

audio: Add ACDB INIT extension 

- Add an audio extension for ACDB
- ACDB Init from AHAL and STHAL are routed via this extension

CRs-Fixed: 2028493
Change-Id: Ib63c8fa4bf1f89d4dbfce8b6584ac1d8271e5f38
parent 28718c54

hal/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ LOCAL_SRC_FILES := \ 
	audio_hw.c \

	voice.c \

	platform_info.c \

	$(AUDIO_PLATFORM)/platform.c

	$(AUDIO_PLATFORM)/platform.c \

        acdb.c



LOCAL_SRC_FILES += audio_extn/audio_extn.c \

                   audio_extn/utils.c

hal/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ c_sources = audio_hw.c \ 
            platform_info.c \

            ${TARGET_PLATFORM}/platform.c \

            audio_extn/audio_extn.c \

            audio_extn/utils.c

            audio_extn/utils.c \

            acdb.c



if HDMI_EDID

AM_CFLAGS += -DHDMI_EDID

hal/acdb.c

0 → 100644
+185 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define LOG_TAG "audio_hw_acdb"

//#define LOG_NDEBUG 0

#define LOG_NDDEBUG 0



#include <stdlib.h>

#include <dlfcn.h>

#include <cutils/log.h>

#include <cutils/list.h>

#include "acdb.h"

#include "platform_api.h"



int acdb_init(int snd_card_num)

{



    int result = -1;

    char *cvd_version = NULL;



    char *snd_card_name = NULL;

    struct mixer *mixer = NULL;

    struct acdb_platform_data *my_data = NULL;



    if(snd_card_num < 0) {

        ALOGE("invalid sound card number");

        return result;

    }



    mixer = mixer_open(snd_card_num);

    if (!mixer) {

        ALOGE("%s: Unable to open the mixer card: %d", __func__,

               snd_card_num);

        goto cleanup;

    }



    my_data = calloc(1, sizeof(struct acdb_platform_data));

    if (!my_data) {

        ALOGE("failed to allocate acdb platform data");

        goto cleanup;

    }



    list_init(&my_data->acdb_meta_key_list);



    /* Extract META KEY LIST INFO */

    platform_info_init(PLATFORM_INFO_XML_PATH, my_data, ACDB_EXTN);



    my_data->acdb_handle = dlopen(LIB_ACDB_LOADER, RTLD_NOW);

    if (my_data->acdb_handle == NULL) {

        ALOGE("%s: DLOPEN failed for %s", __func__, LIB_ACDB_LOADER);

        goto cleanup;

    }



    ALOGV("%s: DLOPEN successful for %s", __func__, LIB_ACDB_LOADER);



    my_data->acdb_init_v3 = (acdb_init_v3_t)dlsym(my_data->acdb_handle,

                                                     "acdb_loader_init_v3");

    if (my_data->acdb_init_v3 == NULL)

        ALOGE("%s: dlsym error %s for acdb_loader_init_v3", __func__, dlerror());



    my_data->acdb_init_v2 = (acdb_init_v2_t)dlsym(my_data->acdb_handle,

                                                     "acdb_loader_init_v2");

    if (my_data->acdb_init_v2 == NULL)

        ALOGE("%s: dlsym error %s for acdb_loader_init_v2", __func__, dlerror());



    my_data->acdb_init = (acdb_init_t)dlsym(my_data->acdb_handle,

                                                 "acdb_loader_init_ACDB");

    if (my_data->acdb_init == NULL && my_data->acdb_init_v2 == NULL

                                                 && my_data->acdb_init_v3 == NULL) {

        ALOGE("%s: dlsym error %s for acdb_loader_init_ACDB", __func__, dlerror());

        goto cleanup;

    }



    /* Get CVD version */

    cvd_version = calloc(1, MAX_CVD_VERSION_STRING_SIZE);

    if (!cvd_version) {

        ALOGE("%s: Failed to allocate cvd version", __func__);

        goto cleanup;

    } else {

        struct mixer_ctl *ctl = NULL;

        int count = 0;



        ctl = mixer_get_ctl_by_name(mixer, CVD_VERSION_MIXER_CTL);

        if (!ctl) {

            ALOGE("%s: Could not get ctl for mixer cmd - %s",  __func__, CVD_VERSION_MIXER_CTL);

            goto cleanup;

        }

        mixer_ctl_update(ctl);



        count = mixer_ctl_get_num_values(ctl);

        if (count > MAX_CVD_VERSION_STRING_SIZE)

            count = MAX_CVD_VERSION_STRING_SIZE;



        result = mixer_ctl_get_array(ctl, cvd_version, count);

        if (result != 0) {

            ALOGE("%s: ERROR! mixer_ctl_get_array() failed to get CVD Version", __func__);

            goto cleanup;

        }

    }



    /* Get Sound card name */

    snd_card_name = strdup(mixer_get_name(mixer));

    if (!snd_card_name) {

        ALOGE("failed to allocate memory for snd_card_name");

        result = -1;

        goto cleanup;

    }



    int key = 0;

    struct listnode *node = NULL;

    struct meta_key_list *key_info = NULL;



    if (my_data->acdb_init_v3) {

        result = my_data->acdb_init_v3(snd_card_name, cvd_version,

                                       &my_data->acdb_meta_key_list);

    } else if (my_data->acdb_init_v2) {

        node = list_head(&my_data->acdb_meta_key_list);

        key_info = node_to_item(node, struct meta_key_list, list);

        key = key_info->cal_info.nKey;

        result = my_data->acdb_init_v2(snd_card_name, cvd_version, key);

    } else {

        result = my_data->acdb_init();

    }



cleanup:

    if (NULL != my_data) {

        if (my_data->acdb_handle)

            dlclose(my_data->acdb_handle);



        struct listnode *node;

        struct meta_key_list *key_info;

        list_for_each(node, &my_data->acdb_meta_key_list) {

            key_info = node_to_item(node, struct meta_key_list, list);

            free(key_info);

        }

        free(my_data);

    }



    if (mixer)

        mixer_close(mixer);



    if (cvd_version)

        free(cvd_version);



    if (snd_card_name)

        free(snd_card_name);



    return result;

}



int acdb_set_metainfo_key(void *platform, char *name, int key) {



    struct meta_key_list *key_info = (struct meta_key_list *)

                                        calloc(1, sizeof(struct meta_key_list));

    struct acdb_platform_data *pdata = (struct acdb_platform_data *)platform;

    if (!key_info) {

        ALOGE("%s: Could not allocate memory for key %d", __func__, key);

        return -ENOMEM;

    }



    key_info->cal_info.nKey = key;

    strlcpy(key_info->name, name, sizeof(key_info->name));

    list_add_tail(&pdata->acdb_meta_key_list, &key_info->list);



    ALOGD("%s: successfully added module %s and key %d to the list", __func__,

               key_info->name, key_info->cal_info.nKey);



    return 0;

}

hal/acdb.h

0 → 100644
+73 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ACDB_H

#define ACDB_H



#include <linux/msm_audio_calibration.h>



#define MAX_CVD_VERSION_STRING_SIZE 100

#define LIB_ACDB_LOADER "libacdbloader.so"

#define CVD_VERSION_MIXER_CTL "CVD Version"

#define ACDB_METAINFO_KEY_MODULE_NAME_LEN 100



#ifdef LINUX_ENABLED

#define PLATFORM_INFO_XML_PATH "/etc/audio_platform_info.xml"

#else

#define PLATFORM_INFO_XML_PATH "/system/etc/audio_platform_info.xml"

#endif



/* Audio calibration related functions */

typedef void (*acdb_deallocate_t)();

typedef int  (*acdb_init_t)();

typedef int  (*acdb_init_v2_t)(const char *, char *, int);

typedef int  (*acdb_init_v3_t)(const char *, char *, struct listnode *);

typedef void (*acdb_send_audio_cal_t)(int, int, int , int);

typedef void (*acdb_send_audio_cal_v3_t)(int, int, int, int, int);

typedef void (*acdb_send_voice_cal_t)(int, int);

typedef int (*acdb_reload_vocvoltable_t)(int);

typedef int  (*acdb_get_default_app_type_t)(void);

typedef int (*acdb_loader_get_calibration_t)(char *attr, int size, void *data);

typedef int (*acdb_set_audio_cal_t) (void *, void *, uint32_t);

typedef int (*acdb_get_audio_cal_t) (void *, void *, uint32_t*);

typedef int (*acdb_send_common_top_t) (void);

typedef int (*acdb_set_codec_data_t) (void *, char *);

typedef int (*acdb_reload_t) (char *, char *, char *, int);

typedef int (*acdb_reload_v2_t) (char *, char *, char *, struct listnode *);

typedef int (*acdb_send_gain_dep_cal_t)(int, int, int, int, int);



struct meta_key_list {

    struct listnode list;

    struct audio_cal_info_metainfo cal_info;

    char name[ACDB_METAINFO_KEY_MODULE_NAME_LEN];

};



struct acdb_platform_data {

    /* Audio calibration related functions */

    void                       *acdb_handle;

    acdb_init_t                acdb_init;

    acdb_init_v2_t             acdb_init_v2;

    acdb_init_v3_t             acdb_init_v3;

    struct listnode acdb_meta_key_list;

};



int acdb_init(int);



int acdb_set_metainfo_key(void *platform, char *name, int key);

#endif //ACDB_H

hal/audio_extn/audio_extn.h

+2 −0
Original line number Diff line number Diff line
@@ -587,6 +587,8 @@ void audio_extn_utils_send_audio_calibration(struct audio_device *adev, 
void audio_extn_utils_update_stream_app_type_cfg_for_usecase(

                                  struct audio_device *adev,

                                  struct audio_usecase *usecase);

int audio_extn_utils_get_snd_card_num();



#ifdef DS2_DOLBY_DAP_ENABLED

#define LIB_DS2_DAP_HAL "vendor/lib/libhwdaphal.so"

#define SET_HW_INFO_FUNC "dap_hal_set_hw_info"