commit c42146f04fbc8729662b8ba2475ca817f59cb316
author Praveen Chavan <pchavan@codeaurora.org> Tue Aug 09 00:19:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 00:19:01 2016 +0000
tree 6beedc1c667ac3cf72de4759c9b2e3a1f5342353
parent d7b26e53bf8fb6fd34770f570ce6424c773c8a68
parent 81c65c9bb90c3628cf476462352535356098bdcc

MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video am: bc4e708bf8
am: 81c65c9bb9

Change-Id: I2fcce6a1248f57b813861a7e1b54f8519532b01a

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 610907d..0d54f4e 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