commit 572864b94e7882c2d23537525c708abcacde43b0
author Jean-Michel Trivi <jmtrivi@google.com> Tue Sep 03 21:43:48 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 03 21:43:49 2013 +0000
tree a2beee7eb30d0945d0ab894138fa6d75a7da59e0
parent 0a4df03542e7d7aab716a60e206dceaf5da178f3
parent 1b02586f0f41d82c80619cfc0d16cd3feb5eaec7

Merge "AAC encoder: handle missing object types" into klp-dev

media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp

diff --git a/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp b/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp
index 5749733..ff2b503 100644
--- a/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp
+++ b/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp
@@ -292,6 +292,10 @@
         return AOT_AAC_LC;
     } else if (profile == OMX_AUDIO_AACObjectHE) {
         return AOT_SBR;
+    } else if (profile == OMX_AUDIO_AACObjectHE_PS) {
+        return AOT_PS;
+    } else if (profile == OMX_AUDIO_AACObjectLD) {
+        return AOT_ER_AAC_LD;
     } else if (profile == OMX_AUDIO_AACObjectELD) {
         return AOT_ER_AAC_ELD;
     } else {