sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-25 09:25:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable delta updates until merging bug is fixed.

Browse source 
The delta updates loose information about previous init segments.
Until this is properly fixed, we can avoid the problem by not
using delta updates.

Issue: #5011
PiperOrigin-RevId: 348023895
This commit is contained in:
tonihei 2020-12-17 16:13:22 +00:00 committed by Oliver Woodman
parent 466826e673
commit cf0a4e528e
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
View file

@ -774,8 +774,9 @@ public final class DefaultHlsPlaylistTracker
}
}
if (playlistSnapshot.serverControl.skipUntilUs != C.TIME_UNSET) {
uriBuilder.appendQueryParameter(
SKIP_PARAM, playlistSnapshot.serverControl.canSkipDateRanges ? "v2" : "YES");
// TODO: Fix skipped segment merging before re-enabling.
// uriBuilder.appendQueryParameter(
// SKIP_PARAM, playlistSnapshot.serverControl.canSkipDateRanges ? "v2" : "YES");
}
return uriBuilder.build();
}

6
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTrackerTest.java
View file

@ -37,6 +37,7 @@ import okhttp3.mockwebserver.MockWebServer;
import okio.Buffer;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -134,6 +135,7 @@ public class DefaultHlsPlaylistTrackerTest {
assertThat(secondFullPlaylist.segments).containsNoneIn(firstFullPlaylist.segments);
}
@Ignore // Test disabled because playlist delta updates are temporarily disabled.
@Test
public void start_playlistCanSkip_requestsDeltaUpdateAndExpandsSkippedSegments()
throws IOException, TimeoutException, InterruptedException {
@ -168,6 +170,7 @@ public class DefaultHlsPlaylistTrackerTest {
.isEqualTo(initialPlaylistWithAllSegments.segments.get(3).url);
}
@Ignore // Test disabled because playlist delta updates are temporarily disabled.
@Test
public void start_playlistCanSkip_missingSegments_correctedMediaSequence()
throws IOException, TimeoutException, InterruptedException {
@ -196,6 +199,7 @@ public class DefaultHlsPlaylistTrackerTest {
assertThat(mergedPlaylist.segments).hasSize(4);
}
@Ignore // Test disabled because playlist delta updates are temporarily disabled.
@Test
public void start_playlistCanSkipDataRanges_requestsDeltaUpdateV2()
throws IOException, TimeoutException, InterruptedException {
@ -220,6 +224,7 @@ public class DefaultHlsPlaylistTrackerTest {
assertThat(mediaPlaylists.get(1).mediaSequence).isEqualTo(11);
}
@Ignore // Test disabled because playlist delta updates are temporarily disabled.
@Test
public void start_playlistCanSkipAndUriWithParams_preservesOriginalParams()
throws IOException, TimeoutException, InterruptedException {
@ -360,6 +365,7 @@ public class DefaultHlsPlaylistTrackerTest {
assertThat(mediaPlaylists.get(1).trailingParts).hasSize(2);
}
@Ignore // Test disabled because playlist delta updates are temporarily disabled.
@Test
public void start_httpBadRequest_forcesFullNonBlockingPlaylistRequest()
throws IOException, TimeoutException, InterruptedException {