loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-14 19:19:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make live HLS default start position at least 2*target duration from live edge

Browse Source 
Issue:#6360
PiperOrigin-RevId: 267615050
This commit is contained in:
aquilescanta 2019-09-06 17:38:30 +01:00 committed by Oliver Woodman
parent 5e8f611f06
commit 0aba89b60e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View File

@ -414,8 +414,18 @@ public final class HlsMediaSource extends BaseMediaSource
playlist.hasEndTag ? offsetFromInitialStartTimeUs + playlist.durationUs : C.TIME_UNSET; playlist.hasEndTag ? offsetFromInitialStartTimeUs + playlist.durationUs : C.TIME_UNSET;
List<HlsMediaPlaylist.Segment> segments = playlist.segments; List<HlsMediaPlaylist.Segment> segments = playlist.segments;
if (windowDefaultStartPositionUs == C.TIME_UNSET) { if (windowDefaultStartPositionUs == C.TIME_UNSET) {
windowDefaultStartPositionUs = segments.isEmpty() ? 0 windowDefaultStartPositionUs = 0;
: segments.get(Math.max(0, segments.size() - 3)).relativeStartTimeUs; if (!segments.isEmpty()) {
int defaultStartSegmentIndex = Math.max(0, segments.size() - 3);
// We attempt to set the default start position to be at least twice the target duration
// behind the live edge.
long minStartPositionUs = playlist.durationUs - playlist.targetDurationUs * 2;
while (defaultStartSegmentIndex > 0
&& segments.get(defaultStartSegmentIndex).relativeStartTimeUs > minStartPositionUs) {
defaultStartSegmentIndex--;
}
windowDefaultStartPositionUs = segments.get(defaultStartSegmentIndex).relativeStartTimeUs;
}
} }
timeline = timeline =
new SinglePeriodTimeline( new SinglePeriodTimeline(