commit aedf0b2ca722dbd75ad56702a9989afed3db1d7e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 05 20:43:25 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 20:43:25 2019 +0000
tree 672f316276f7ffc83be12f89a04b9d7a01188ed0
parent 1eedcc01516ea9601b976f8bfbe19a5190f37267
parent 6bd3bdf056c7b248205e092159879dc5011f660a

Merge "AACWriter: support all possible channel counts"

media/libstagefright/AACWriter.cpp

diff --git a/media/libstagefright/AACWriter.cpp b/media/libstagefright/AACWriter.cpp
index 2ea5fcd..9eba7e9 100644
--- a/media/libstagefright/AACWriter.cpp
+++ b/media/libstagefright/AACWriter.cpp
@@ -85,7 +85,7 @@
     CHECK(!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC));
     CHECK(meta->findInt32(kKeyChannelCount, &mChannelCount));
     CHECK(meta->findInt32(kKeySampleRate, &mSampleRate));
-    CHECK(mChannelCount >= 1 && mChannelCount <= 2);
+    CHECK(mChannelCount >= 1 && mChannelCount <= 7);
 
     // Optionally, we want to check whether AACProfile is also set.
     if (meta->findInt32(kKeyAACProfile, &mAACProfile)) {