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

Commit 1dd2d6a8 authored by Aditya Bavanari's avatar Aditya Bavanari Committed by Gerrit - the friendly Code Review server
Browse files

hal: Call into v4 version of acdb loader send audio cal 

Call into acdb_loader_send_audio_cal_v4 to set the backend sample
rate for sending the respective afe calibration tables.

Change-Id: If641368cfa116fb2ccb655eb49514d29d91d982c
parent d4b3e7c7

hal/acdb.h

+2 −1
Original line number Diff line number Diff line 
/*

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

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

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -50,6 +50,7 @@ typedef int (*acdb_init_v3_t)(const char *, char *, struct listnode *); 
typedef int  (*acdb_init_v4_t)(void *, int);

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_audio_cal_v4_t)(int, 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);

hal/msm8974/platform.c

+21 −1
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ struct platform_data { 
    acdb_deallocate_t          acdb_deallocate;

    acdb_send_audio_cal_t      acdb_send_audio_cal;

    acdb_send_audio_cal_v3_t   acdb_send_audio_cal_v3;

    acdb_send_audio_cal_v4_t   acdb_send_audio_cal_v4;

    acdb_set_audio_cal_t       acdb_set_audio_cal;

    acdb_get_audio_cal_t       acdb_get_audio_cal;

    acdb_send_voice_cal_t      acdb_send_voice_cal;
@@ -3259,6 +3260,12 @@ void *platform_init(struct audio_device *adev) 
            ALOGE("%s: Could not find the symbol acdb_send_audio_cal_v3 from %s",

                  __func__, LIB_ACDB_LOADER);



        my_data->acdb_send_audio_cal_v4 = (acdb_send_audio_cal_v4_t)dlsym(my_data->acdb_handle,

                                                    "acdb_loader_send_audio_cal_v4");

        if (!my_data->acdb_send_audio_cal_v4)

            ALOGE("%s: Could not find the symbol acdb_send_audio_cal_v4 from %s",

                  __func__, LIB_ACDB_LOADER);



        my_data->acdb_set_audio_cal = (acdb_set_audio_cal_t)dlsym(my_data->acdb_handle,

                                                    "acdb_loader_set_audio_cal_v2");

        if (!my_data->acdb_set_audio_cal)
@@ -4940,6 +4947,7 @@ int platform_send_audio_calibration(void *platform, struct audio_usecase *usecas 
    bool is_incall_rec_usecase = false;

    snd_device_t incall_rec_device;

    int sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

    struct audio_backend_cfg backend_cfg = {0};



    if (voice_is_in_call(my_data->adev))

        is_incall_rec_usecase = voice_is_in_call_rec_stream(usecase->stream.in);
@@ -4978,11 +4986,13 @@ int platform_send_audio_calibration(void *platform, struct audio_usecase *usecas 
            acdb_dev_id = acdb_device_table[platform_get_spkr_prot_snd_device(new_snd_device[i])];

            sample_rate = audio_extn_utils_get_app_sample_rate_for_device(my_data->adev, usecase,

                                                          new_snd_device[i]);

            platform_get_codec_backend_cfg(my_data->adev, new_snd_device[i], &backend_cfg);

        } else {

            // Use in_call_rec snd_device to extract the ACDB device ID instead of split snd devices

            acdb_dev_id = acdb_device_table[platform_get_spkr_prot_snd_device(snd_device)];

            sample_rate = audio_extn_utils_get_app_sample_rate_for_device(my_data->adev, usecase,

                                                          snd_device);

            platform_get_codec_backend_cfg(my_data->adev, snd_device, &backend_cfg);

        }



        // Do not use Rx path default app type for TX path
@@ -4991,6 +5001,12 @@ int platform_send_audio_calibration(void *platform, struct audio_usecase *usecas 
            app_type  = DEFAULT_APP_TYPE_TX_PATH;

        }



        /* Override backend cfg sample rate in calibration for vi feedback usecase */

        if (usecase->id == USECASE_AUDIO_SPKR_CALIB_TX) {

            ALOGV("Reset backend cfg sample rate to 8KHz for spkr calib Tx use case");

            backend_cfg.sample_rate = sample_rate;

        }



        if (acdb_dev_id < 0) {

            ALOGE("%s: Could not find acdb id for device(%d)",

                  __func__, new_snd_device[i]);
@@ -5015,7 +5031,11 @@ int platform_send_audio_calibration(void *platform, struct audio_usecase *usecas 
        else

            acdb_dev_type = ACDB_DEV_TYPE_IN;



        if (my_data->acdb_send_audio_cal_v3) {

        if (my_data->acdb_send_audio_cal_v4) {

            my_data->acdb_send_audio_cal_v4(acdb_dev_id, acdb_dev_type,

                                            app_type, sample_rate, i,

                                            backend_cfg.sample_rate);

        } else if (my_data->acdb_send_audio_cal_v3) {

            my_data->acdb_send_audio_cal_v3(acdb_dev_id, acdb_dev_type,

                                            app_type, sample_rate, i);

        } else if (my_data->acdb_send_audio_cal) {