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

Commit f56b6407 authored by Aniket Kumar Lata's avatar Aniket Kumar Lata Committed by Gerrit - the friendly Code Review server
Browse files

hal: add support to override volume gain to step mapping table 

- if customer mapping is added in platform info file, use that
- in absence of customer table use default mapping

CRs-Fixed: 1089771
Change-Id: I4bf8bcf1913f16ad6298ff1f3fa5dd649c889b2a
parent bb7e07ee

hal/audio_hw.c

+21 −0
Original line number Diff line number Diff line
@@ -472,6 +472,27 @@ static int check_and_set_gapless_mode(struct audio_device *adev, bool enable_gap 
    return 0;

}



__attribute__ ((visibility ("default")))

int audio_hw_get_gain_level_mapping(struct amp_db_and_gain_table *mapping_tbl,

                                    int table_size) {

     int ret_val = 0;

     ALOGV("%s: enter ... ", __func__);



     pthread_mutex_lock(&adev_init_lock);

     if (adev == NULL) {

         ALOGW("%s: adev is NULL .... ", __func__);

         goto done;

     }



     pthread_mutex_lock(&adev->lock);

     ret_val = platform_get_gain_level_mapping(mapping_tbl, table_size);

     pthread_mutex_unlock(&adev->lock);

done:

     pthread_mutex_unlock(&adev_init_lock);

     ALOGV("%s: exit ... ", __func__);

     return ret_val;

}



static bool is_supported_format(audio_format_t format)

{

    if (format == AUDIO_FORMAT_MP3 ||

hal/msm8916/platform.c

+11 −0
Original line number Diff line number Diff line
@@ -5835,3 +5835,14 @@ int platform_get_max_mic_count(void *platform) { 
    struct platform_data *my_data = (struct platform_data *)platform;

    return my_data->max_mic_count;

}



bool platform_add_gain_level_mapping(struct amp_db_and_gain_table *tbl_entry __unused)

{

    return false;

}



int platform_get_gain_level_mapping(struct amp_db_and_gain_table *mapping_tbl __unused,

                                    int table_size __unused)

{

    return 0;

}

hal/msm8960/platform.c

+10 −0
Original line number Diff line number Diff line
@@ -1340,3 +1340,13 @@ bool platform_check_codec_asrc_support(void *platform __unused) 
    return false;

}



bool platform_add_gain_level_mapping(struct amp_db_and_gain_table *tbl_entry __unused)

{

    return false;

}



int platform_get_gain_level_mapping(struct amp_db_and_gain_table *mapping_tbl __unused,

                                    int table_size __unused)

{

    return 0;

}

hal/msm8974/platform.c

+50 −0
Original line number Diff line number Diff line
@@ -5860,3 +5860,53 @@ int platform_get_max_mic_count(void *platform) { 
    struct platform_data *my_data = (struct platform_data *)platform;

    return my_data->max_mic_count;

}



static struct amp_db_and_gain_table tbl_mapping[MAX_VOLUME_CAL_STEPS];

static int num_gain_tbl_entry = 0;



bool platform_add_gain_level_mapping(struct amp_db_and_gain_table *tbl_entry) {



    ALOGV("%s: enter .. add %f %f %d", __func__, tbl_entry->amp, tbl_entry->db, tbl_entry->level);

    if (num_gain_tbl_entry == -1) {

        ALOGE("%s: num entry beyond valid step levels or corrupted..rejecting custom mapping",

               __func__);

        return false;

    }



    if (num_gain_tbl_entry >= MAX_VOLUME_CAL_STEPS) {

        ALOGE("%s: max entry reached max[%d] current index[%d]  .. rejecting", __func__,

               MAX_VOLUME_CAL_STEPS, num_gain_tbl_entry);

        num_gain_tbl_entry  = -1; // indicates error and no more info will be cached

        return false;

    }



    if (num_gain_tbl_entry > 0 && tbl_mapping[num_gain_tbl_entry - 1].amp >= tbl_entry->amp) {

        ALOGE("%s: value not in ascending order .. rejecting custom mapping", __func__);

        num_gain_tbl_entry  = -1; // indicates error and no more info will be cached

        return false;

    }



    tbl_mapping[num_gain_tbl_entry] = *tbl_entry;

    ++num_gain_tbl_entry;



    return true;

}



int platform_get_gain_level_mapping(struct amp_db_and_gain_table *mapping_tbl,

                                    int table_size) {

    int itt = 0;

    ALOGV("platform_get_gain_level_mapping called ");



    if (num_gain_tbl_entry <= 0 || num_gain_tbl_entry > MAX_VOLUME_CAL_STEPS) {

        ALOGD("%s: empty or currupted gain_mapping_table", __func__);

        return 0;

    }



    for (; itt < num_gain_tbl_entry && itt <= table_size; itt++) {

        mapping_tbl[itt] = tbl_mapping[itt];

        ALOGV("%s: added amp[%f] db[%f] level[%d]", __func__,

               mapping_tbl[itt].amp, mapping_tbl[itt].db, mapping_tbl[itt].level);

    }



    return num_gain_tbl_entry;

}

hal/platform_api.h

+22 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#ifndef AUDIO_PLATFORM_API_H

#define AUDIO_PLATFORM_API_H

#include <sound/voice_params.h>

#include "audio_hw.h"

#include "voice.h"



#define CODEC_BACKEND_DEFAULT_BIT_WIDTH 16

#define CODEC_BACKEND_DEFAULT_SAMPLE_RATE 48000
@@ -28,6 +30,13 @@ 
#define SAMPLE_RATE_8000 8000

#define SAMPLE_RATE_11025 11025

#define sample_rate_multiple(sr, base) ((sr % base)== 0?true:false)

#define MAX_VOLUME_CAL_STEPS 15



struct amp_db_and_gain_table {

    float amp;

    float db;

    uint32_t level;

};



enum {

    NATIVE_AUDIO_MODE_SRC = 1,
@@ -47,6 +56,19 @@ enum card_status_t; 
void *platform_init(struct audio_device *adev);

void platform_deinit(void *platform);

const char *platform_get_snd_device_name(snd_device_t snd_device);



/* return true if adding entry success

   return false if adding entry fails */



bool platform_add_gain_level_mapping(struct amp_db_and_gain_table *tbl_entry);



/* return 0 if no custome mapping table found or when error detected

            use default mapping in this case

   return > 0 indicates number of entries in mapping table */



int platform_get_gain_level_mapping(struct amp_db_and_gain_table *mapping_tbl,

                                    int table_size);



int platform_get_snd_device_name_extn(void *platform, snd_device_t snd_device,

                                      char *device_name);

void platform_add_backend_name(char *mixer_path, snd_device_t snd_device,