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

Revert "hal: set backend channel number to one for mono speaker" 

This reverts commit bd55e0be3b.
Removal of HAL access to channel mixer ctrl fixes the issue
as a better approach.

Change-Id: I5457bbc2e5185047289f440cbea222a6592f71b1
This commit is contained in:
Xiaojun Sang 2018-11-06 19:37:44 +08:00 committed by Gerrit - the friendly Code Review server
parent 36fc0e3052
commit 841cb5f27e
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hal/msm8974/platform.c
View File

@ -3364,22 +3364,6 @@ int native_audio_set_params(struct platform_data *platform,
return ret; return ret;
} }
static bool check_snd_device_is_speaker(snd_device_t snd_device)
{
bool ret = false;
if (snd_device == SND_DEVICE_OUT_SPEAKER ||
snd_device == SND_DEVICE_OUT_SPEAKER_WSA ||
snd_device == SND_DEVICE_OUT_SPEAKER_VBAT ||
snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED ||
snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT ||
snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS ||
snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS) {
ret = true;
}
return ret;
}
int check_hdset_combo_device(snd_device_t snd_device) int check_hdset_combo_device(snd_device_t snd_device)
{ {
int ret = false; int ret = false;
@ -6673,12 +6657,7 @@ bool platform_check_and_set_codec_backend_cfg(struct audio_device* adev,
backend_cfg.bit_width = usecase->stream.out->bit_width; backend_cfg.bit_width = usecase->stream.out->bit_width;
backend_cfg.sample_rate = usecase->stream.out->sample_rate; backend_cfg.sample_rate = usecase->stream.out->sample_rate;
backend_cfg.format = usecase->stream.out->format; backend_cfg.format = usecase->stream.out->format;
if (!(hw_info_is_stereo_spkr(my_data->hw_info)) && backend_cfg.channels = audio_channel_count_from_out_mask(usecase->stream.out->channel_mask);
check_snd_device_is_speaker(snd_device))
backend_cfg.channels = 1;
else
backend_cfg.channels =
audio_channel_count_from_out_mask(usecase->stream.out->channel_mask);
} }
if (audio_extn_is_dsp_bit_width_enforce_mode_supported(usecase->stream.out->flags) && if (audio_extn_is_dsp_bit_width_enforce_mode_supported(usecase->stream.out->flags) &&
(adev->dsp_bit_width_enforce_mode > backend_cfg.bit_width)) (adev->dsp_bit_width_enforce_mode > backend_cfg.bit_width))