From 3f4a16555d837c08c89088c1377951478416c1e4 Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Wed, 9 Oct 2024 16:54:59 +0800
Subject: [PATCH] Bugfix: segment_duration and media_time use different unit

---
 .../media3/extractor/mp4/FragmentedMp4Extractor.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
index a3ef9643b3..0404b5da02 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
@@ -1151,9 +1151,9 @@ public class FragmentedMp4Extractor implements Extractor {
     }
     long editListEndMediaTimeUs =
         Util.scaleLargeTimestamp(
-            track.editListDurations[0] + track.editListMediaTimes[0],
-            C.MICROS_PER_SECOND,
-            track.movieTimescale);
+            track.editListDurations[0], C.MICROS_PER_SECOND, track.movieTimescale) +
+        Util.scaleLargeTimestamp(
+            track.editListMediaTimes[0], C.MICROS_PER_SECOND, track.timescale);
     return editListEndMediaTimeUs >= track.durationUs;
   }