commit 4f71d50364ac464b17afbd8a76f3235b56d38a8a
author Bharath Ramachandramurthy <bramacha@codeaurora.org> Sun Oct 23 19:45:22 2011 -0700
committer Sidipotu Ashok <sashok@codeaurora.org> Mon Oct 24 18:58:41 2011 +0530
tree 0b9f5d264a05d7f2b6124e06c0f00281cf7fcb45
parent 87c1fd03c227ca8a77fcb3b681ce293c2af4e085

msm: audio: qdsp6v2: Fix for enabling dolby aac decoder.

Previously, dolby aac decoder was enabled by disabling
legacy aac decoder. This change should correct it.

Change-Id: I0b46a444701585921c546c6668a0bc0c8e63ec50
Signed-off-by: Bharath Ramachandramurthy <bramacha@codeaurora.org>

include/sound/apr_audio.h

diff --git a/include/sound/apr_audio.h b/include/sound/apr_audio.h
index 0c109ae..d2a7dba 100644
--- a/include/sound/apr_audio.h
+++ b/include/sound/apr_audio.h
@@ -847,7 +847,7 @@
 #define ADPCM        0x00010BE7
 #define YADPCM       0x00010BE8
 #define MP3          0x00010BE9
-#define MPEG4_AAC    0x00010D86
+#define MPEG4_AAC    0x00010BEA
 #define AMRNB_FS     0x00010BEB
 #define V13K_FS      0x00010BED
 #define EVRC_FS      0x00010BEE
@@ -862,6 +862,7 @@
 #define G711_ALAW_FS 0x00010BF7
 #define G711_MLAW_FS 0x00010BF8
 #define G711_PCM_FS  0x00010BF9
+#define MPEG4_MULTI_AAC 0x00010D86
 
 #define ASM_ENCDEC_SBCRATE         0x00010C13
 #define ASM_ENCDEC_IMMDIATE_DECODE 0x00010C14

include/sound/q6asm.h

diff --git a/include/sound/q6asm.h b/include/sound/q6asm.h
index bad9be7..fc7e521 100644
--- a/include/sound/q6asm.h
+++ b/include/sound/q6asm.h
@@ -38,6 +38,7 @@
 #define FORMAT_WMA_V10PRO   0x000e
 #define FORMAT_WMA_V9	    0x000f
 #define FORMAT_AMR_WB_PLUS  0x0010
+#define FORMAT_MPEG4_MULTI_AAC 0x0011
 
 #define ENCDEC_SBCBITRATE   0x0001
 #define ENCDEC_IMMEDIATE_DECODE 0x0002
@@ -241,6 +242,9 @@
 int q6asm_media_format_block_aac(struct audio_client *ac,
 			struct asm_aac_cfg *cfg);
 
+int q6asm_media_format_block_multi_aac(struct audio_client *ac,
+			struct asm_aac_cfg *cfg);
+
 int q6asm_media_format_block_wma(struct audio_client *ac,
 			void *cfg);