commit eb2c7c372615427b3b6350f1f563382b0b70917e
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Aug 09 01:19:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 09 01:19:25 2016 +0000
tree 360b0c9aa0fb11040caa0a1b1bc3a7dafeeb3f3c
parent 4995d513312708632541a3b6400a6a482235bf65
parent e1c8063521b0645b091b080d896106b2e6fd8670

Merge "Camera: use wp for NotificationListener" into nyc-mr1-dev

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 66c4ffd..4681abd 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -3030,8 +3030,6 @@
     mOwner->writeInt16(0x18);        // depth
     mOwner->writeInt16(-1);          // predefined
 
-    CHECK_LT(23 + mCodecSpecificDataSize, 128);
-
     if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_MPEG4, mime)) {
         writeMp4vEsdsBox();
     } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_H263, mime)) {
@@ -3151,6 +3149,10 @@
 void MPEG4Writer::Track::writeMp4vEsdsBox() {
     CHECK(mCodecSpecificData);
     CHECK_GT(mCodecSpecificDataSize, 0);
+
+    // Make sure all sizes encode to a single byte.
+    CHECK_LT(23 + mCodecSpecificDataSize, 128);
+
     mOwner->beginBox("esds");
 
     mOwner->writeInt32(0);    // version=0, flags=0