From ee6bb9e25d904ffdcd124a7d32fef6759f3cf05a Mon Sep 17 00:00:00 2001 From: trav90 Date: Sun, 15 Jan 2017 02:30:39 -0600 Subject: [PATCH] Revert "MP4 dts must use the same timeline as pts" --- media/libstagefright/binding/MoofParser.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media/libstagefright/binding/MoofParser.cpp b/media/libstagefright/binding/MoofParser.cpp index a91ff17a09..540668f013 100644 --- a/media/libstagefright/binding/MoofParser.cpp +++ b/media/libstagefright/binding/MoofParser.cpp @@ -520,8 +520,7 @@ Moof::ParseTrun(Box& aBox, Tfhd& aTfhd, Mvhd& aMvhd, Mdhd& aMdhd, Edts& aEdts, u sample.mByteRange = MediaByteRange(offset, offset + sampleSize); offset += sampleSize; - sample.mDecodeTime = - aMdhd.ToMicroseconds((int64_t)decodeTime - aEdts.mMediaStart) + aMvhd.ToMicroseconds(aEdts.mEmptyOffset); + sample.mDecodeTime = aMdhd.ToMicroseconds(decodeTime); sample.mCompositionRange = Interval( aMdhd.ToMicroseconds((int64_t)decodeTime + ctsOffset - aEdts.mMediaStart) + aMvhd.ToMicroseconds(aEdts.mEmptyOffset), aMdhd.ToMicroseconds((int64_t)decodeTime + ctsOffset + sampleDuration - aEdts.mMediaStart) + aMvhd.ToMicroseconds(aEdts.mEmptyOffset));