commit 359f90cea8a59c4a8d25b422fd0b0569e31db2fa
author James Dong <jdong@google.com> Wed May 02 11:34:06 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 02 11:34:06 2012 -0700
tree 05021b3aa01e00fce65f3ba0be9111442eb5dfda
parent 06f6ae34c735640dccdaca6ab1567d8afc9d3938
parent 2d94235a343151bed9aa74e86697fa01241ea5cf

Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev

media/libstagefright/AACWriter.cpp

diff --git a/media/libstagefright/AACWriter.cpp b/media/libstagefright/AACWriter.cpp
index 21c5428..284ba01 100644
--- a/media/libstagefright/AACWriter.cpp
+++ b/media/libstagefright/AACWriter.cpp
@@ -98,9 +98,13 @@
     CHECK(!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC));
     CHECK(meta->findInt32(kKeyChannelCount, &mChannelCount));
     CHECK(meta->findInt32(kKeySampleRate, &mSampleRate));
-    CHECK(meta->findInt32(kKeyAACProfile, &mAACProfile));
     CHECK(mChannelCount >= 1 && mChannelCount <= 2);
 
+    // Optionally, we want to check whether AACProfile is also set.
+    if (meta->findInt32(kKeyAACProfile, &mAACProfile)) {
+        ALOGI("AAC profile is changed to %d", mAACProfile);
+    }
+
     mSource = source;
     return OK;
 }