commit 4a7bef0af941e2c614dbc960e51bce9888478d06
author Ray Essick <essick@google.com> Thu Mar 08 19:28:59 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 08 19:28:59 2018 +0000
tree 130c26fdacd7a2dab759c4817184812f15abe91d
parent e08745693f76d40ea1b6e89f4cef13f66dd12257
parent f4f08c3307becefd226ef09c383b357ba1f5efad

Merge changes from topic "am-3bd7761d-0a22-43c4-98aa-44bfc62874ad" into oc-dev am: e17682a20c am: 6c5e30f60c am: 4d4c461237 am: 6fd4657ec9
am: f4f08c3307

Change-Id: I44f381f4e45858a1af8896e21c11f0ebf1eb1b86

media/libstagefright/mpeg2ts/ESQueue.cpp

diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 50b1bea..0fa9fcb 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -1495,7 +1495,9 @@
         const uint8_t *data, size_t size) {
     static const char kStartCode[] = "\x00\x00\x01";
 
-    if (size < 3) {
+    // per ISO/IEC 14496-2 6.2.1, a chunk has a 3-byte prefix + 1-byte start code
+    // we need at least <prefix><start><next prefix> to successfully scan
+    if (size < 3 + 1 + 3) {
         return -EAGAIN;
     }
 
@@ -1503,7 +1505,7 @@
         return -EAGAIN;
     }
 
-    size_t offset = 3;
+    size_t offset = 4;
     while (offset + 2 < size) {
         if (!memcmp(&data[offset], kStartCode, 3)) {
             return offset;
@@ -1554,6 +1556,9 @@
                     state = EXPECT_VISUAL_OBJECT_START;
                 } else {
                     discard = true;
+                    offset += chunkSize;
+                    ALOGW("b/74114680, advance to next chunk");
+                    android_errorWriteLog(0x534e4554, "74114680");
                 }
                 break;
             }