Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "dsp: codecs: add support to enable multiaac 5.1 channel playback"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-16 03:09:21 -08:00 committed by Gerrit - the friendly Code Review server
commit b4e447d3e0
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dsp/codecs/audio_multi_aac.c
View file

@ -111,7 +111,14 @@ static long audio_ioctl_shared(struct file *file, unsigned int cmd,
pr_err("cmd media format block failed\n");
break;
}
rc = q6asm_set_encdec_chan_map(audio->ac, 2);
/* Fall back to the default number of channels
* if aac_cfg.ch_cfg is not between 1-6
*/
if ((aac_cfg.ch_cfg == 0) || (aac_cfg.ch_cfg > 6))
aac_cfg.ch_cfg = 2;
rc = q6asm_set_encdec_chan_map(audio->ac, aac_cfg.ch_cfg);
if (rc < 0) {
pr_err("%s: cmd set encdec_chan_map failed\n",
__func__);