dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "hal: Add support for Backend port specific channel map"

This commit is contained in:
qctecmdr 2019-04-14 23:26:18 -07:00 committed by Gerrit - the friendly Code Review server
parent ba40066c7a 4dbd2c04eb
commit c603441aaa
3 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hal/msm8916/platform.c
View File

@ -6047,7 +6047,7 @@ static int platform_set_codec_backend_cfg(struct audio_device* adev,
my_data->current_backend_cfg[backend_idx].channels = channels;
if (backend_idx == HDMI_RX_BACKEND)
platform_set_edid_channels_configuration(adev->platform, channels, HDMI_RX_BACKEND);
platform_set_edid_channels_configuration(adev->platform, channels, HDMI_RX_BACKEND, snd_device);
ALOGD("%s:becf: afe: %s set to %s", __func__,
my_data->current_backend_cfg[backend_idx].channels_mixer_ctl, channel_cnt_str);
@ -6425,6 +6425,8 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev,
if (channels != my_data->current_backend_cfg[backend_idx].channels)
channels_updated = true;
platform_set_edid_channels_configuration(adev->platform, channels, backend_idx, snd_device);
}
//check if mulitchannel clip needs to be down sampled to 48k
@ -6542,7 +6544,7 @@ bool platform_check_and_set_codec_backend_cfg(struct audio_device* adev,
if ((my_data->spkr_ch_map != NULL) &&
(platform_get_backend_index(snd_device) == DEFAULT_CODEC_BACKEND))
platform_set_channel_map(my_data, my_data->spkr_ch_map->num_ch,
my_data->spkr_ch_map->chmap, -1);
my_data->spkr_ch_map->chmap, -1, -1);
if (platform_split_snd_device(adev->platform, snd_device,
&num_devices, new_snd_devices) < 0)
@ -7092,7 +7094,7 @@ int platform_set_stream_channel_map(void *platform, audio_channel_mask_t channel
return -1;
}
}
ret = platform_set_channel_map(platform, channels, channel_map, snd_id);
ret = platform_set_channel_map(platform, channels, channel_map, snd_id, -1);
return ret;
}
@ -7232,7 +7234,7 @@ int platform_set_channel_allocation(void *platform, int channel_alloc)
return ret;
}
int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd_id)
int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd_id, int be_idx __unused)
{
struct mixer_ctl *ctl;
char mixer_ctl_name[44] = {0}; // max length of name is 44 as defined
@ -7394,7 +7396,7 @@ bool platform_is_edid_supported_sample_rate(void *platform, int sample_rate)
return false;
}
int platform_set_edid_channels_configuration(void *platform, int channels, int backend_idx __unused) {
int platform_set_edid_channels_configuration(void *platform, int channels, int backend_idx __unused, snd_device_t snd_device __unused) {
struct platform_data *my_data = (struct platform_data *)platform;
struct audio_device *adev = my_data->adev;
@ -7427,9 +7429,9 @@ int platform_set_edid_channels_configuration(void *platform, int channels, int b
*/
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);
(char *)adev_device_cfg_ptr->dev_cfg_params.channel_map, -1, -1);
} else {
platform_set_channel_map(platform, channel_count, info->channel_map, -1);
platform_set_channel_map(platform, channel_count, info->channel_map, -1, -1);
}
if (adev_device_cfg_ptr->use_client_dev_cfg) {
@ -7448,7 +7450,7 @@ int platform_set_edid_channels_configuration(void *platform, int channels, int b
default_channelMap[0] = PCM_CHANNEL_FL;
default_channelMap[1] = PCM_CHANNEL_FR;
}
platform_set_channel_map(platform,2,default_channelMap,-1);
platform_set_channel_map(platform, 2, default_channelMap, -1, -1);
platform_set_channel_allocation(platform,0);
}
}

52
hal/msm8974/platform.c
View File

@ -7339,7 +7339,7 @@ static int platform_set_codec_backend_cfg(struct audio_device* adev,
if ((backend_idx == HDMI_RX_BACKEND) ||
(backend_idx == DISP_PORT_RX_BACKEND))
platform_set_edid_channels_configuration(adev->platform, channels, backend_idx);
platform_set_edid_channels_configuration(adev->platform, channels, backend_idx, snd_device);
ALOGD("%s:becf: afe: %s set to %s ", __func__,
my_data->current_backend_cfg[backend_idx].channels_mixer_ctl,
@ -7763,6 +7763,8 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev,
if (channels != my_data->current_backend_cfg[backend_idx].channels)
channels_updated = true;
platform_set_edid_channels_configuration(adev->platform, channels, backend_idx, snd_device);
}
ALOGI("%s:becf: afe: Codec selected backend: %d updated bit width: %d and sample rate: %d",
@ -7812,11 +7814,13 @@ bool platform_check_and_set_codec_backend_cfg(struct audio_device* adev,
int backend_idx = DEFAULT_CODEC_BACKEND;
int new_snd_devices[SND_DEVICE_OUT_END] = {0};
int i, num_devices = 1;
int device_be_idx = -1;
bool ret = false;
struct platform_data *my_data = (struct platform_data *)adev->platform;
struct audio_backend_cfg backend_cfg;
backend_idx = platform_get_backend_index(snd_device);
device_be_idx = platform_get_snd_device_backend_index(snd_device);
if (usecase->type == TRANSCODE_LOOPBACK_RX) {
backend_cfg.bit_width = usecase->stream.inout->out_config.bit_width;
@ -7856,7 +7860,7 @@ bool platform_check_and_set_codec_backend_cfg(struct audio_device* adev,
if ((my_data->spkr_ch_map != NULL) &&
(platform_get_backend_index(snd_device) == DEFAULT_CODEC_BACKEND))
platform_set_channel_map(my_data, my_data->spkr_ch_map->num_ch,
my_data->spkr_ch_map->chmap, -1);
my_data->spkr_ch_map->chmap, -1, device_be_idx);
if (platform_split_snd_device(my_data, snd_device, &num_devices,
new_snd_devices) < 0)
@ -8447,7 +8451,7 @@ int platform_set_stream_channel_map(void *platform, audio_channel_mask_t channel
return -1;
}
}
ret = platform_set_channel_map(platform, channels, channel_map, snd_id);
ret = platform_set_channel_map(platform, channels, channel_map, snd_id, -1);
return ret;
}
@ -8561,13 +8565,16 @@ int platform_set_channel_allocation(void *platform, int channel_alloc)
return ret;
}
int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd_id)
int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd_id, int be_idx)
{
struct mixer_ctl *ctl;
struct mixer_ctl *ctl, *be_ctl = NULL;
char mixer_ctl_name[44] = {0}; // max length of name is 44 as defined
char be_mixer_ctl_name[] = "Backend Device Channel Map";
int ret;
int i=0, n=0;
int be_id_count = 0;
long set_values[AUDIO_MAX_DSP_CHANNELS];
long be_set_values[AUDIO_MAX_DSP_CHANNELS + 1] = {0};
struct platform_data *my_data = (struct platform_data *)platform;
struct audio_device *adev = my_data->adev;
ALOGV("%s channel_count:%d",__func__, ch_count);
@ -8592,7 +8599,20 @@ int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd
if (snd_id >= 0) {
snprintf(mixer_ctl_name, sizeof(mixer_ctl_name), "Playback Channel Map%d", snd_id);
} else {
strlcpy(mixer_ctl_name, "Playback Device Channel Map", sizeof(mixer_ctl_name));
if (be_idx >= 0) {
be_ctl = mixer_get_ctl_by_name(adev->mixer, be_mixer_ctl_name);
if (!be_ctl) {
ALOGD("%s: Could not get ctl for mixer cmd - %s, using default control",
__func__, be_mixer_ctl_name);
strlcpy(mixer_ctl_name, "Playback Device Channel Map", sizeof(mixer_ctl_name));
be_idx = -1;
} else {
strlcpy(mixer_ctl_name, "Backend Device Channel Map", sizeof(mixer_ctl_name));
be_id_count = 1;
}
} else {
strlcpy(mixer_ctl_name, "Playback Device Channel Map", sizeof(mixer_ctl_name));
}
}
ALOGD("%s mixer_ctl_name:%s", __func__, mixer_ctl_name);
@ -8616,7 +8636,7 @@ int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd
return -EINVAL;
}
if (n > AUDIO_MAX_DSP_CHANNELS) {
if (n > (AUDIO_MAX_DSP_CHANNELS + be_id_count)) {
ALOGE("%s mixerctl elem size %d > AUDIO_MAX_DSP_CHANNELS %d",__func__, n, AUDIO_MAX_DSP_CHANNELS);
return -EINVAL;
}
@ -8633,7 +8653,13 @@ int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd
set_values[0], set_values[1], set_values[2], set_values[3], set_values[4],
set_values[5], set_values[6], set_values[7], ch_count);
ret = mixer_ctl_set_array(ctl, set_values, n);
if (be_idx >= 0) {
be_set_values[0] = be_idx;
memcpy(&be_set_values[1], set_values, sizeof(long) * ch_count);
ret = mixer_ctl_set_array(ctl, be_set_values, ARRAY_SIZE(be_set_values));
} else {
ret = mixer_ctl_set_array(ctl, set_values, ARRAY_SIZE(set_values));
}
if (ret < 0) {
ALOGE("%s: Could not set ctl, error:%d ch_count:%d",
@ -8839,7 +8865,7 @@ bool platform_spkr_use_default_sample_rate(void *platform) {
return my_data->use_sprk_default_sample_rate;
}
int platform_set_edid_channels_configuration(void *platform, int channels, int backend_idx) {
int platform_set_edid_channels_configuration(void *platform, int channels, int backend_idx, snd_device_t snd_device) {
struct platform_data *my_data = (struct platform_data *)platform;
struct audio_device *adev = my_data->adev;
@ -8848,6 +8874,7 @@ int platform_set_edid_channels_configuration(void *platform, int channels, int b
int i, ret;
char default_channelMap[MAX_CHANNELS_SUPPORTED] = {0};
struct audio_device_config_param *adev_device_cfg_ptr = adev->device_cfg_params;
int be_idx = -1;
if ((backend_idx != HDMI_RX_BACKEND) &&
(backend_idx != DISP_PORT_RX_BACKEND)) {
@ -8855,6 +8882,7 @@ int platform_set_edid_channels_configuration(void *platform, int channels, int b
return -EINVAL;
}
be_idx = platform_get_snd_device_backend_index(snd_device);
ret = platform_get_edid_info(platform);
info = (edid_audio_info *)my_data->edid_info;
adev_device_cfg_ptr += backend_idx;
@ -8877,9 +8905,9 @@ int platform_set_edid_channels_configuration(void *platform, int channels, int b
*/
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);
(char *)adev_device_cfg_ptr->dev_cfg_params.channel_map, -1, be_idx);
} else {
platform_set_channel_map(platform, channel_count, info->channel_map, -1);
platform_set_channel_map(platform, channel_count, info->channel_map, -1, be_idx);
}
if (adev_device_cfg_ptr->use_client_dev_cfg) {
@ -8898,7 +8926,7 @@ int platform_set_edid_channels_configuration(void *platform, int channels, int b
default_channelMap[0] = PCM_CHANNEL_FL;
default_channelMap[1] = PCM_CHANNEL_FR;
}
platform_set_channel_map(platform,2,default_channelMap,-1);
platform_set_channel_map(platform, 2, default_channelMap, -1, be_idx);
platform_set_channel_allocation(platform,0);
}
}

5
hal/platform_api.h
View File

@ -230,7 +230,7 @@ int platform_set_channel_allocation(void *platform, int channel_alloc);
int platform_get_edid_info(void *platform);
int platform_get_supported_copp_sampling_rate(uint32_t stream_sr);
int platform_set_channel_map(void *platform, int ch_count, char *ch_map,
int snd_id);
int snd_id, int be_idx);
int platform_set_stream_channel_map(void *platform, audio_channel_mask_t channel_mask,
int snd_id, uint8_t *input_channel_map);
int platform_set_stream_pan_scale_params(void *platform,
@ -240,7 +240,8 @@ int platform_set_stream_downmix_params(void *platform,
int snd_id,
snd_device_t snd_device,
struct mix_matrix_params mm_params);
int platform_set_edid_channels_configuration(void *platform, int channels, int backend_idx);
int platform_set_edid_channels_configuration(void *platform, int channels,
int backend_idx, snd_device_t snd_device);
bool platform_spkr_use_default_sample_rate(void *platform);
unsigned char platform_map_to_edid_format(int format);
bool platform_is_edid_supported_format(void *platform, int format);