Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc01860 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio-lnx: dsp: codecs: modify API to configure output PCM block"

parents 7deefbcc e169e990

dsp/codecs/audio_aac.c

+3 −1
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ static long audio_ioctl_shared(struct file *file, unsigned int cmd, 
							audio->ac->session);

		if (audio->feedback == NON_TUNNEL_MODE) {

			/* Configure PCM output block */

			rc = q6asm_enc_cfg_blk_pcm(audio->ac, 0, 0);

			rc = q6asm_enc_cfg_blk_pcm(audio->ac,

						audio->pcm_cfg.sample_rate,

						audio->pcm_cfg.channel_count);

			if (rc < 0) {

				pr_err("pcm output block config failed\n");

				break;

dsp/codecs/audio_multi_aac.c

+3 −3
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ static long audio_ioctl_shared(struct file *file, unsigned int cmd, 
						audio->ac->session);

		if (audio->feedback == NON_TUNNEL_MODE) {

			/* Configure PCM output block */

			rc = q6asm_enc_cfg_blk_pcm_native(audio->ac,

				aac_cfg.sample_rate,

				aac_cfg.ch_cfg);

			rc = q6asm_enc_cfg_blk_pcm(audio->ac,

					audio->pcm_cfg.sample_rate,

					audio->pcm_cfg.channel_count);

			if (rc < 0) {

				pr_err("pcm output block config failed\n");

				break;