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

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

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

parents 1ad069c7 2ea01bbf

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
@@ -4263,6 +4263,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;