summaryrefslogtreecommitdiffstats
path: root/libAACenc/src/aacenc.cpp
diff options
context:
space:
mode:
authorSatya Krishna Pindiproli <satyak@codeaurora.org>2016-06-29 15:57:56 +0530
committerLinux Build Service Account <lnxbuild@localhost>2016-08-24 08:08:15 -0600
commitacbe346dd9546ecd4623103ea14c6a6abbf2ea3f (patch)
treef898922e006336dd631477122ed1d2328245be84 /libAACenc/src/aacenc.cpp
parent508c82f6e77bc736f2932d3059f91565df72fd69 (diff)
downloadandroid_external_aac-acbe346dd9546ecd4623103ea14c6a6abbf2ea3f.tar.gz
android_external_aac-acbe346dd9546ecd4623103ea14c6a6abbf2ea3f.tar.bz2
android_external_aac-acbe346dd9546ecd4623103ea14c6a6abbf2ea3f.zip
external/aac: enable MP2 encoding for WFDstaging/cm-14.1-cafrebasecm-14.1_prerebasecm-14.1_oldcm-14.0
Enable MP2 encoding for WFD. Change-Id: I4cc08c15494422dc20d970dc3a6c2c63eb0c761a
Diffstat (limited to 'libAACenc/src/aacenc.cpp')
-rw-r--r--libAACenc/src/aacenc.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/libAACenc/src/aacenc.cpp b/libAACenc/src/aacenc.cpp
index 5e8c08d..35cb675 100644
--- a/libAACenc/src/aacenc.cpp
+++ b/libAACenc/src/aacenc.cpp
@@ -690,7 +690,14 @@ AAC_ENCODER_ERROR FDKaacEnc_Initialize(HANDLE_AAC_ENC hAacEnc,
if (ErrorStatus != AAC_ENC_OK)
goto bail;
- hAacEnc->aot = hAacEnc->config->audioObjectType;
+ /* Map virtual aot's to intern aot used in bitstream writer. */
+ switch (hAacEnc->config->audioObjectType) {
+ case AOT_MP2_AAC_LC:
+ hAacEnc->aot = AOT_AAC_LC;
+ break;
+ default:
+ hAacEnc->aot = hAacEnc->config->audioObjectType;
+ }
/* common things */