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

Commit 64289b9b authored by Satya Krishna Pindiproli's avatar Satya Krishna Pindiproli Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: qdsp6v2: 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: default avatarSatya Krishna Pindiproli <satyak@codeaurora.org>
parent aa450b1d

drivers/misc/qcom/qdsp6v2/audio_aac.c

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -46,7 +46,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;

drivers/misc/qcom/qdsp6v2/audio_multi_aac.c

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -58,9 +58,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;