From a3d6f03ff9c8aff56c49ad37dc806e6e80a20a5c Mon Sep 17 00:00:00 2001 From: Justin Wong <46082645+uvjustin@users.noreply.github.com> Date: Sun, 28 Mar 2021 18:50:55 +0800 Subject: [PATCH] Use playlist start time for target live offset --- .../google/android/exoplayer2/source/hls/HlsMediaSource.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index e5c233ef43..1927ceb0cb 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -616,7 +616,9 @@ public final class HlsMediaSource extends BaseMediaSource HlsMediaPlaylist.ServerControl serverControl = playlist.serverControl; // Select part hold back only if the playlist has a part target duration. long offsetToEndOfPlaylistUs; - if (serverControl.partHoldBackUs != C.TIME_UNSET + if (playlist.startOffsetUs != C.TIME_UNSET) { + offsetToEndOfPlaylistUs = playlist.durationUs - playlist.startOffsetUs; + } else if (serverControl.partHoldBackUs != C.TIME_UNSET && playlist.partTargetDurationUs != C.TIME_UNSET) { offsetToEndOfPlaylistUs = serverControl.partHoldBackUs; } else if (serverControl.holdBackUs != C.TIME_UNSET) {