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

Pass valid channel count and sample rate information to
configure AAC decoder component and modify the API used
to configure the output PCM block when multi AAC decoder
component is used in non-tunnelled mode.

Change-Id: I5938f316a39b722924416b6910e6c8b835e7855e
Signed-off-by: Satya Krishna Pindiproli <satyak@codeaurora.org>

dsp/codecs/audio_aac.c

@@ -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

@@ -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;