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

Commit 2ea01bbf authored by Arun Kumar Dasari's avatar Arun Kumar Dasari Committed by Gerrit - the friendly Code Review server
Browse files

ASoc: msm: qdsp6v2: add support for AAC LATM playback 



Add support for AAC LATM clips. Define macro for AAC LATM format
and configure media format block with this value for AAC LATM clips.

CRs-Fixed: 1108268
Change-Id: I10cf2db9fc7e4d40d2bf910e162b3c2d95d8a03c
Signed-off-by: default avatarSurendar karka <sukark@codeaurora.org>
parent 0a8e939a

include/sound/apr_audio-v2.h

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

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

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 2 and
@@ -4120,6 +4120,9 @@ struct asm_multi_channel_pcm_enc_cfg_v2 { 
/* Enumeration for the raw AAC format. */

#define ASM_MEDIA_FMT_AAC_FORMAT_FLAG_RAW    3



/* Enumeration for the AAC LATM format. */

#define ASM_MEDIA_FMT_AAC_FORMAT_FLAG_LATM   4



#define ASM_MEDIA_FMT_AAC_AOT_LC             2

#define ASM_MEDIA_FMT_AAC_AOT_SBR            5

#define ASM_MEDIA_FMT_AAC_AOT_PS             29

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -863,6 +863,9 @@ static int msm_compr_send_media_format_block(struct snd_compr_stream *cstream, 
		if (prtd->codec_param.codec.format ==

					SND_AUDIOSTREAMFORMAT_MP4ADTS)

			aac_cfg.format = 0x0;

		else if (prtd->codec_param.codec.format ==

					SND_AUDIOSTREAMFORMAT_MP4LATM)

			aac_cfg.format = 0x04;

		else

			aac_cfg.format = 0x03;

		aac_cfg.ch_cfg = prtd->num_channels;