hal: Add API to support device configuration
Add new API to set device configuration from Client.
Currently the device config is set from edid.
New API overwrites the default device config with
client provided values.
CRs-fixed: 2071954
Change-Id: I1f0918acf0a420f9c9d8a17bc070637199cb7105
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 3ffacb8..0eb31ec 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2211,6 +2211,8 @@
strdup("SLIM_0_RX Format");
my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].samplerate_mixer_ctl =
strdup("SLIM_0_RX SampleRate");
+ my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].channels_mixer_ctl =
+ strdup("SLIM_0_RX Channels");
my_data->current_backend_cfg[DSD_NATIVE_BACKEND].bitwidth_mixer_ctl =
strdup("SLIM_2_RX Format");
@@ -5117,7 +5119,7 @@
static int platform_set_codec_backend_cfg(struct audio_device* adev,
snd_device_t snd_device, struct audio_backend_cfg backend_cfg)
{
- int ret = 0;
+ int ret = -EINVAL;
int backend_idx = platform_get_backend_index(snd_device);
struct platform_data *my_data = (struct platform_data *)adev->platform;
backend_idx = platform_get_backend_index(snd_device);
@@ -5126,6 +5128,23 @@
unsigned int channels = backend_cfg.channels;
audio_format_t format = backend_cfg.format;
bool passthrough_enabled = backend_cfg.passthrough_enabled;
+ struct audio_device_config_param *adev_device_cfg_ptr = adev->device_cfg_params;
+
+ /* Override the config params if client has already set them */
+ adev_device_cfg_ptr += backend_idx;
+ if (adev_device_cfg_ptr->use_client_dev_cfg) {
+ ALOGV("%s::: Updating with the config set by client "
+ "bitwidth %d, samplerate %d, channels %d format %d",
+ __func__, adev_device_cfg_ptr->dev_cfg_params.bit_width,
+ adev_device_cfg_ptr->dev_cfg_params.sample_rate,
+ adev_device_cfg_ptr->dev_cfg_params.channels,
+ adev_device_cfg_ptr->dev_cfg_params.format);
+
+ bit_width = adev_device_cfg_ptr->dev_cfg_params.bit_width;
+ sample_rate = adev_device_cfg_ptr->dev_cfg_params.sample_rate;
+ channels = adev_device_cfg_ptr->dev_cfg_params.channels;
+ format = adev_device_cfg_ptr->dev_cfg_params.format;
+ }
ALOGI("%s:becf: afe: bitwidth %d, samplerate %d channels %d"
", backend_idx %d device (%s)", __func__, bit_width,
@@ -5167,8 +5186,8 @@
ret = 0;
}
- if (passthrough_enabled || ((my_data->current_backend_cfg[backend_idx].samplerate_mixer_ctl) &&
- (sample_rate != my_data->current_backend_cfg[backend_idx].sample_rate))) {
+ if ((my_data->current_backend_cfg[backend_idx].samplerate_mixer_ctl) &&
+ (passthrough_enabled || (sample_rate != my_data->current_backend_cfg[backend_idx].sample_rate))) {
char *rate_str = NULL;
struct mixer_ctl *ctl = NULL;
@@ -5230,6 +5249,7 @@
my_data->current_backend_cfg[backend_idx].samplerate_mixer_ctl, rate_str);
mixer_ctl_set_enum_by_string(ctl, rate_str);
my_data->current_backend_cfg[backend_idx].sample_rate = sample_rate;
+ ret = 0;
}
if ((my_data->current_backend_cfg[backend_idx].channels_mixer_ctl) &&
(channels != my_data->current_backend_cfg[backend_idx].channels)) {
@@ -5270,9 +5290,10 @@
if (backend_idx == HDMI_RX_BACKEND)
platform_set_edid_channels_configuration(adev->platform, channels);
- ALOGD("%s:becf: afe: %s set to %s", __func__,
+ ALOGD("%s:becf: afe: %s set to %s ", __func__,
my_data->current_backend_cfg[backend_idx].channels_mixer_ctl,
channel_cnt_str);
+ ret = 0;
}
bool set_ext_disp_format = false;
@@ -5303,6 +5324,7 @@
ALOGD("%s: Ext display PCM format", __func__);
mixer_ctl_set_enum_by_string(ctl, "LPCM");
}
+ ret = 0;
}
return ret;
}
@@ -5413,6 +5435,7 @@
struct platform_data *my_data = (struct platform_data *)adev->platform;
int na_mode = platform_get_native_support();
bool channels_updated = false;
+ struct audio_device_config_param *adev_device_cfg_ptr = adev->device_cfg_params;
/*BT devices backend is not configured from HAL hence skip*/
if (snd_device == SND_DEVICE_OUT_BT_A2DP ||
@@ -5585,7 +5608,6 @@
channels_updated = true;
}
-
ALOGI("%s:becf: afe: Codec selected backend: %d updated bit width: %d and sample rate: %d",
__func__, backend_idx , bit_width, sample_rate);
@@ -5604,6 +5626,14 @@
__func__, backend_cfg->bit_width, backend_cfg->sample_rate, backend_cfg->channels);
}
+ // Force routing if the client sends config params for this backend
+ adev_device_cfg_ptr += backend_idx;
+ if (adev_device_cfg_ptr->use_client_dev_cfg) {
+ ALOGV("%s: Codec backend needs to be updated as Client provided "
+ "config params", __func__);
+ backend_change = true;
+ }
+
if (snd_device == SND_DEVICE_OUT_HEADPHONES || snd_device ==
SND_DEVICE_OUT_HEADPHONES_44_1) {
if (sample_rate > 48000 ||
@@ -5671,9 +5701,13 @@
ALOGI("%s: new_snd_devices[%d] is %d", __func__, i, new_snd_devices[i]);
if ((platform_check_codec_backend_cfg(adev, usecase, new_snd_devices[i],
&backend_cfg))) {
- platform_set_codec_backend_cfg(adev, new_snd_devices[i],
+ ret = platform_set_codec_backend_cfg(adev, new_snd_devices[i],
backend_cfg);
- ret = true;
+ if (!ret) {
+ ret = true;
+ } else {
+ ret = false;
+ }
}
}
return ret;
@@ -6349,13 +6383,16 @@
int platform_set_edid_channels_configuration(void *platform, int channels) {
struct platform_data *my_data = (struct platform_data *)platform;
+ struct audio_device *adev = my_data->adev;
edid_audio_info *info = NULL;
int channel_count = 2;
int i, ret;
char default_channelMap[MAX_CHANNELS_SUPPORTED] = {0};
+ struct audio_device_config_param *adev_device_cfg_ptr = adev->device_cfg_params;
ret = platform_get_edid_info(platform);
info = (edid_audio_info *)my_data->edid_info;
+ adev_device_cfg_ptr += HDMI_RX_BACKEND;
if(ret == 0 && info != NULL) {
if (channels > 2) {
@@ -6374,11 +6411,29 @@
* though the input channel count set on adm is less than or equal to
* max supported channel count
*/
- platform_set_channel_map(platform, channel_count, info->channel_map, -1);
- platform_set_channel_allocation(platform, info->channel_allocation);
+ if (adev_device_cfg_ptr->use_client_dev_cfg) {
+ platform_set_channel_map(platform, adev_device_cfg_ptr->dev_cfg_params.channels,
+ (char *)adev_device_cfg_ptr->dev_cfg_params.channel_map, -1);
+ } else {
+ platform_set_channel_map(platform, channel_count, info->channel_map, -1);
+ }
+
+ if (adev_device_cfg_ptr->use_client_dev_cfg) {
+ ALOGV("%s:: Setting client selected CA %d", __func__,
+ adev_device_cfg_ptr->dev_cfg_params.channel_allocation);
+ platform_set_channel_allocation(platform,
+ adev_device_cfg_ptr->dev_cfg_params.channel_allocation);
+ } else {
+ platform_set_channel_allocation(platform, info->channel_allocation);
+ }
} else {
- default_channelMap[0] = PCM_CHANNEL_FL;
- default_channelMap[1] = PCM_CHANNEL_FR;
+ if (adev_device_cfg_ptr->use_client_dev_cfg) {
+ default_channelMap[0] = adev_device_cfg_ptr->dev_cfg_params.channel_map[0];
+ default_channelMap[1] = adev_device_cfg_ptr->dev_cfg_params.channel_map[1];
+ } else {
+ default_channelMap[0] = PCM_CHANNEL_FL;
+ default_channelMap[1] = PCM_CHANNEL_FR;
+ }
platform_set_channel_map(platform,2,default_channelMap,-1);
platform_set_channel_allocation(platform,0);
}
@@ -6880,3 +6935,8 @@
return num_gain_tbl_entry;
}
+
+int platform_get_max_codec_backend() {
+
+ return MAX_CODEC_BACKENDS;
+}