commit a6709b41c015fdb7d5c717ec91e04b2c9c7da6e5
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 12 19:19:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 12 19:19:21 2018 +0000
tree 4bb0a1218a457249d2f8501052a94438c71bf2b0
parent dce7559514917e7975a0d2dcc11aaa97d770367a
parent 986274d9c932d0df597d7809761b4cac2ac8e650

Merge "MPEG4Writer: Handle writing of multiple NAL unit." into pi-dev

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index cfbbcb2..a2f4380 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -1376,15 +1376,12 @@
 }
 
 void MPEG4Writer::addMultipleLengthPrefixedSamples_l(MediaBuffer *buffer) {
-    const size_t kExtensionNALSearchRange = 64; // bytes to look for non-VCL NALUs
-
     const uint8_t *dataStart = (const uint8_t *)buffer->data() + buffer->range_offset();
     const uint8_t *currentNalStart = dataStart;
     const uint8_t *nextNalStart;
     const uint8_t *data = dataStart;
     size_t nextNalSize;
-    size_t searchSize = buffer->range_length() > kExtensionNALSearchRange ?
-                   kExtensionNALSearchRange : buffer->range_length();
+    size_t searchSize = buffer->range_length();
 
     while (getNextNALUnit(&data, &searchSize, &nextNalStart,
             &nextNalSize, true) == OK) {