From ae2e84df35c777d7b03ea7fa59bb8e01d82b26ed Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 6 Jan 2017 08:25:00 -0800 Subject: [PATCH] Set HLS period duration when live stream ends ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=143776633 --- .../google/android/exoplayer2/source/hls/HlsMediaSource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index b7195cb79d..575106f784 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -105,11 +105,12 @@ public final class HlsMediaSource implements MediaSource, public void onPrimaryPlaylistRefreshed(HlsMediaPlaylist playlist) { SinglePeriodTimeline timeline; if (playlistTracker.isLive()) { - // TODO: fix windowPositionInPeriodUs when playlist is empty. + long periodDurationUs = playlist.hasEndTag ? (playlist.startTimeUs + playlist.durationUs) + : C.TIME_UNSET; List segments = playlist.segments; long windowDefaultStartPositionUs = segments.isEmpty() ? 0 : segments.get(Math.max(0, segments.size() - 3)).relativeStartTimeUs; - timeline = new SinglePeriodTimeline(C.TIME_UNSET, playlist.durationUs, + timeline = new SinglePeriodTimeline(periodDurationUs, playlist.durationUs, playlist.startTimeUs, windowDefaultStartPositionUs, true, !playlist.hasEndTag); } else /* not live */ { timeline = new SinglePeriodTimeline(playlist.startTimeUs + playlist.durationUs,