diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-07-31 16:03:44 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-22 17:14:35 -0700 |
| commit | 37c5d30af6797192de58586ab4ef64b2fcdc7ae9 (patch) | |
| tree | ca5048e849277f1051d67d73940bf60929ecb379 /media | |
| parent | b821ad110a85fa27f84e732ecbf7322319ec4db9 (diff) | |
| download | frameworks_av-37c5d30af6797192de58586ab4ef64b2fcdc7ae9.zip frameworks_av-37c5d30af6797192de58586ab4ef64b2fcdc7ae9.tar.gz frameworks_av-37c5d30af6797192de58586ab4ef64b2fcdc7ae9.tar.bz2 | |
Fix harmless unsigned overflow in recoverPTS
Change-Id: I89e3a827cf566421e8dd9b6a3c842e73a19c140f
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp index e3c3e80..f9a9c4c 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -509,7 +509,7 @@ int64_t ATSParser::Program::recoverPTS(uint64_t PTS_33bit) { mLastRecoveredPTS = static_cast<int64_t>(PTS_33bit); } else { mLastRecoveredPTS = static_cast<int64_t>( - ((mLastRecoveredPTS - PTS_33bit + 0x100000000ll) + ((mLastRecoveredPTS - static_cast<int64_t>(PTS_33bit) + 0x100000000ll) & 0xfffffffe00000000ull) | PTS_33bit); // We start from 0, but recovered PTS could be slightly below 0. // Clamp it to 0 as rest of the pipeline doesn't take negative pts. |