Skip to content

Fix HLS timeline jump when PROGRAM-DATE-TIME shifts #3382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndyWangLYN wants to merge 1 commit into
base: release
Choose a base branch
from
+68 −4
Open

Fix HLS timeline jump when PROGRAM-DATE-TIME shifts #3382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...r_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,18 +663,21 @@ private HlsMediaPlaylist getLatestPlaylistSnapshot(

private long getLoadedPlaylistStartTimeUs(
@Nullable HlsMediaPlaylist oldPlaylist, HlsMediaPlaylist loadedPlaylist) {
if (loadedPlaylist.hasProgramDateTime) {
return loadedPlaylist.startTimeUs;
}
long primarySnapshotStartTimeUs =
primaryMediaPlaylistSnapshot != null ? primaryMediaPlaylistSnapshot.startTimeUs : 0;
if (oldPlaylist == null) {
return primarySnapshotStartTimeUs;
return loadedPlaylist.hasProgramDateTime
? loadedPlaylist.startTimeUs
: primarySnapshotStartTimeUs;
}
int oldPlaylistSize = oldPlaylist.segments.size();
Segment firstOldOverlappingSegment = getFirstOldOverlappingSegment(oldPlaylist, loadedPlaylist);
if (firstOldOverlappingSegment != null) {
// Prefer continuity with the previous snapshot for overlapping media. Program date time
// values are wall-clock metadata and may shift between refreshes.
return oldPlaylist.startTimeUs + firstOldOverlappingSegment.relativeStartTimeUs;
} else if (loadedPlaylist.hasProgramDateTime) {
return loadedPlaylist.startTimeUs;
} else if (oldPlaylistSize == loadedPlaylist.mediaSequence - oldPlaylist.mediaSequence) {
return oldPlaylist.getEndTimeUs();
} else {
Expand Down
61 changes: 61 additions & 0 deletions ...s/src/test/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTrackerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,36 @@ public class DefaultHlsPlaylistTrackerTest {
+ "#EXT-X-TARGETDURATION:10\n"
+ "#EXTINF:10,\n"
+ "a-clone-segment1.ts\n";
private static final String MEDIA_PLAYLIST_WITH_PROGRAM_DATE_TIME =
"#EXTM3U\n"
+ "#EXT-X-VERSION:3\n"
+ "#EXT-X-TARGETDURATION:6\n"
+ "#EXT-X-MEDIA-SEQUENCE:0\n"
+ "#EXT-X-DISCONTINUITY-SEQUENCE:0\n"
+ "#EXT-X-START:TIME-OFFSET=0\n"
+ "#EXT-X-PROGRAM-DATE-TIME:2026-07-16T09:20:26.281Z\n"
+ "#EXT-X-DISCONTINUITY\n"
+ "#EXTINF:0.185760,\n"
+ "l1_6a58a1d3ee8ac1baff0fc11e.aac\n"
+ "#EXT-X-DISCONTINUITY\n"
+ "#EXTINF:5.990748,\n"
+ "l0_6a58a262ee8ac1baff0fc136.aac\n"
+ "#EXTINF:5.990748,\n"
+ "l0_6a58a268ee8ac1baff0fc137.aac\n"
+ "#EXTINF:5.990748,\n"
+ "l0_6a58a26eee8ac1baff0fc138.aac\n";
private static final String MEDIA_PLAYLIST_UPDATE_WITH_SHIFTED_PROGRAM_DATE_TIME =
"#EXTM3U\n"
+ "#EXT-X-VERSION:3\n"
+ "#EXT-X-TARGETDURATION:6\n"
+ "#EXT-X-MEDIA-SEQUENCE:2\n"
+ "#EXT-X-DISCONTINUITY-SEQUENCE:2\n"
+ "#EXT-X-START:TIME-OFFSET=0\n"
+ "#EXT-X-PROGRAM-DATE-TIME:2026-07-16T09:21:08.047Z\n"
+ "#EXTINF:5.990748,\n"
+ "l0_6a58a268ee8ac1baff0fc137.aac\n"
+ "#EXTINF:5.990748,\n"
+ "l0_6a58a26eee8ac1baff0fc138.aac\n";

private MockWebServer mockWebServer;
private int enqueueCounter;
Expand Down Expand Up @@ -196,6 +226,37 @@ public void start_playlistCanNotSkip_requestsFullUpdate()
assertThat(secondFullPlaylist.segments).containsNoneIn(firstFullPlaylist.segments);
}

@Test
public void start_playlistUpdateWithShiftedProgramDateTime_preservesOverlappingSegmentTime()
throws IOException, TimeoutException, InterruptedException {
List<HttpUrl> httpUrls =
enqueueWebServerResponses(
new String[] {"/multivariant.m3u8", "/media0/playlist.m3u8", "/media0/playlist.m3u8"},
getMockResponse(SAMPLE_M3U8_LIVE_MULTIVARIANT),
new MockResponse()
.setResponseCode(200)
.setBody(MEDIA_PLAYLIST_WITH_PROGRAM_DATE_TIME),
new MockResponse()
.setResponseCode(200)
.setBody(MEDIA_PLAYLIST_UPDATE_WITH_SHIFTED_PROGRAM_DATE_TIME));

List<HlsMediaPlaylist> mediaPlaylists =
runPlaylistTrackerAndCollectMediaPlaylists(
new DefaultHttpDataSource.Factory(),
/* downloadExecutorSupplier= */ null,
Uri.parse(mockWebServer.url("/multivariant.m3u8").toString()),
/* awaitedMediaPlaylistCount= */ 2);

assertRequestUrlsCalled(httpUrls);
HlsMediaPlaylist initialPlaylist = mediaPlaylists.get(0);
HlsMediaPlaylist updatedPlaylist = mediaPlaylists.get(1);
assertThat(updatedPlaylist.segments.get(0).url)
.isEqualTo(initialPlaylist.segments.get(2).url);
assertThat(updatedPlaylist.startTimeUs)
.isEqualTo(
initialPlaylist.startTimeUs + initialPlaylist.segments.get(2).relativeStartTimeUs);
}

@Test
public void start_playlistCanSkip_requestsDeltaUpdateAndExpandsSkippedSegments()
throws IOException, TimeoutException, InterruptedException {
Expand Down