From 7fe5230a7ef3a5a5f2a812ec24b10e3202f224f4 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 18 Sep 2018 09:33:07 -0700 Subject: [PATCH] Use gapless edit duration as sample table duration This matches the non-gapless case. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=213462936 --- .../google/android/exoplayer2/extractor/mp4/AtomParsers.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java index d36e90a1ef..7104630a23 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java @@ -349,8 +349,11 @@ import java.util.List; gaplessInfoHolder.encoderDelay = (int) encoderDelay; gaplessInfoHolder.encoderPadding = (int) encoderPadding; Util.scaleLargeTimestampsInPlace(timestamps, C.MICROS_PER_SECOND, track.timescale); + long editedDurationUs = + Util.scaleLargeTimestamp( + track.editListDurations[0], C.MICROS_PER_SECOND, track.movieTimescale); return new TrackSampleTable( - track, offsets, sizes, maximumSize, timestamps, flags, durationUs); + track, offsets, sizes, maximumSize, timestamps, flags, editedDurationUs); } } }