diff options
| author | Wonsik Kim <wonsik@google.com> | 2015-06-11 05:13:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 05:13:54 +0000 |
| commit | f4b30c200cfc7c8c502f759dcb90979586e43b27 (patch) | |
| tree | f2507ddcfafbcc14b714ea7de96eb2743491cf3e /media/libstagefright/mpeg2ts | |
| parent | 3a20d29ff09ca2568cb904415625cc44db37edb0 (diff) | |
| parent | 65959d34fdab8319dbf765be5fbf7ff8051eedf1 (diff) | |
| download | frameworks_av-f4b30c200cfc7c8c502f759dcb90979586e43b27.zip frameworks_av-f4b30c200cfc7c8c502f759dcb90979586e43b27.tar.gz frameworks_av-f4b30c200cfc7c8c502f759dcb90979586e43b27.tar.bz2 | |
Merge "mpeg2ts: more error tolerance" into mnc-dev
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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 ATSParser::Stream::parse( 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 @@ status_t ATSParser::Stream::parsePES(ABitReader *br, SyncEvent *event) { return ERROR_MALFORMED; } - if (br->numBitsLeft() < dataLength * 8) { - return ERROR_MALFORMED; - } - onPayloadData( PTS_DTS_flags, PTS, DTS, br->data(), dataLength, event); |