commit f4b30c200cfc7c8c502f759dcb90979586e43b27
author Wonsik Kim <wonsik@google.com> Thu Jun 11 05:13:52 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 11 05:13:54 2015 +0000
tree f2507ddcfafbcc14b714ea7de96eb2743491cf3e
parent 3a20d29ff09ca2568cb904415625cc44db37edb0
parent 65959d34fdab8319dbf765be5fbf7ff8051eedf1

Merge "mpeg2ts: more error tolerance" into mnc-dev

media/libstagefright/mpeg2ts/ATSParser.cpp

diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp
index db429f6..e3c3e80 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.cpp
+++ b/media/libstagefright/mpeg2ts/ATSParser.cpp
@@ -694,7 +694,8 @@
             status_t err = flush(event);
 
             if (err != OK) {
-                return err;
+                ALOGW("Error (%08x) happened while flushing; we simply discard "
+                      "the PES packet and continue.", err);
             }
         }
 
@@ -996,10 +997,6 @@
                 return ERROR_MALFORMED;
             }
 
-            if (br->numBitsLeft() < dataLength * 8) {
-                return ERROR_MALFORMED;
-            }
-
             onPayloadData(
                     PTS_DTS_flags, PTS, DTS, br->data(), dataLength, event);