hal: Add support for Volume Boost
Add support in AHAL for Volume Boost. A parameter is received
from the UI and the volume boost feature set ID is sent to the
calibration driver to send the volume boosted calibration.
Change-Id: Iafb099b2750deaf58dc5f073f31a23abb9bfe950
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 272dea8..d562a0c 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -61,6 +61,12 @@
#define AUDIO_PARAMETER_KEY_FLUENCE_TYPE "fluence"
#define AUDIO_PARAMETER_KEY_BTSCO "bt_samplerate"
#define AUDIO_PARAMETER_KEY_SLOWTALK "st_enable"
+#define AUDIO_PARAMETER_KEY_VOLUME_BOOST "volume_boost"
+
+enum {
+ VOICE_FEATURE_SET_DEFAULT,
+ VOICE_FEATURE_SET_VOLUME_BOOST
+};
struct audio_block_header
{
@@ -73,6 +79,7 @@
typedef int (*acdb_init_t)();
typedef void (*acdb_send_audio_cal_t)(int, int);
typedef void (*acdb_send_voice_cal_t)(int, int);
+typedef int (*acdb_reload_vocvoltable_t)(int);
struct platform_data {
struct audio_device *adev;
@@ -84,11 +91,13 @@
int btsco_sample_rate;
bool slowtalk;
/* Audio calibration related functions */
- void *acdb_handle;
- acdb_init_t acdb_init;
- acdb_deallocate_t acdb_deallocate;
- acdb_send_audio_cal_t acdb_send_audio_cal;
- acdb_send_voice_cal_t acdb_send_voice_cal;
+ void *acdb_handle;
+ int voice_feature_set;
+ acdb_init_t acdb_init;
+ acdb_deallocate_t acdb_deallocate;
+ acdb_send_audio_cal_t acdb_send_audio_cal;
+ acdb_send_voice_cal_t acdb_send_voice_cal;
+ acdb_reload_vocvoltable_t acdb_reload_vocvoltable;
void *hw_info;
struct csd_data *csd;
@@ -522,6 +531,7 @@
}
}
+ my_data->voice_feature_set = VOICE_FEATURE_SET_DEFAULT;
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);
@@ -529,13 +539,28 @@
ALOGV("%s: DLOPEN successful for %s", __func__, LIB_ACDB_LOADER);
my_data->acdb_deallocate = (acdb_deallocate_t)dlsym(my_data->acdb_handle,
"acdb_loader_deallocate_ACDB");
+ if (!my_data->acdb_deallocate)
+ ALOGE("%s: Could not find the symbol acdb_loader_deallocate_ACDB from %s",
+ __func__, LIB_ACDB_LOADER);
+
my_data->acdb_send_audio_cal = (acdb_send_audio_cal_t)dlsym(my_data->acdb_handle,
"acdb_loader_send_audio_cal");
if (!my_data->acdb_send_audio_cal)
- ALOGW("%s: Could not find the symbol acdb_send_audio_cal from %s",
+ ALOGE("%s: Could not find the symbol acdb_send_audio_cal from %s",
__func__, LIB_ACDB_LOADER);
+
my_data->acdb_send_voice_cal = (acdb_send_voice_cal_t)dlsym(my_data->acdb_handle,
"acdb_loader_send_voice_cal");
+ if (!my_data->acdb_send_voice_cal)
+ ALOGE("%s: Could not find the symbol acdb_loader_send_voice_cal from %s",
+ __func__, LIB_ACDB_LOADER);
+
+ my_data->acdb_reload_vocvoltable = (acdb_reload_vocvoltable_t)dlsym(my_data->acdb_handle,
+ "acdb_loader_reload_vocvoltable");
+ if (!my_data->acdb_reload_vocvoltable)
+ ALOGE("%s: Could not find the symbol acdb_loader_reload_vocvoltable from %s",
+ __func__, LIB_ACDB_LOADER);
+
my_data->acdb_init = (acdb_init_t)dlsym(my_data->acdb_handle,
"acdb_loader_init_ACDB");
if (my_data->acdb_init == NULL)
@@ -1354,6 +1379,24 @@
ALOGE("%s: Failed to set slow talk err: %d", __func__, ret);
}
+ ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_VOLUME_BOOST,
+ value, sizeof(value));
+ if (ret >= 0) {
+ str_parms_del(parms, AUDIO_PARAMETER_KEY_VOLUME_BOOST);
+
+ if (my_data->acdb_reload_vocvoltable == NULL) {
+ ALOGE("%s: acdb_reload_vocvoltable is NULL", __func__);
+ } else if (!strcmp(value, "on")) {
+ if (!my_data->acdb_reload_vocvoltable(VOICE_FEATURE_SET_VOLUME_BOOST)) {
+ my_data->voice_feature_set = 1;
+ }
+ } else {
+ if (!my_data->acdb_reload_vocvoltable(VOICE_FEATURE_SET_DEFAULT)) {
+ my_data->voice_feature_set = 0;
+ }
+ }
+ }
+
ALOGV("%s: exit with code(%d)", __func__, ret);
return ret;
}
@@ -1476,6 +1519,18 @@
my_data->slowtalk);
}
+ ret = str_parms_get_str(query, AUDIO_PARAMETER_KEY_VOLUME_BOOST,
+ value, sizeof(value));
+ if (ret >= 0) {
+ if (my_data->voice_feature_set == VOICE_FEATURE_SET_VOLUME_BOOST) {
+ strlcpy(value, "on", sizeof(value));
+ } else {
+ strlcpy(value, "off", sizeof(value));
+ }
+
+ str_parms_add_str(reply, AUDIO_PARAMETER_KEY_VOLUME_BOOST, value);
+ }
+
ALOGV("%s: exit: returns - %s", __func__, str_parms_to_str(reply));
}