Migrate usages of deprecated MediaItem symbols

#minor-release

PiperOrigin-RevId: 407847729
This commit is contained in:
ibaker 2021-11-05 17:04:13 +00:00 committed by Ian Baker
parent 1f1b12751a
commit 429672903f
5 changed files with 315 additions and 242 deletions

View file

@ -300,12 +300,13 @@ public class TimelineTest {
window.isSeekable = true;
window.isDynamic = true;
window.liveConfiguration =
new LiveConfiguration(
/* targetOffsetMs= */ 1,
/* minOffsetMs= */ 2,
/* maxOffsetMs= */ 3,
/* minPlaybackSpeed= */ 0.5f,
/* maxPlaybackSpeed= */ 1.5f);
new LiveConfiguration.Builder()
.setTargetOffsetMs(1)
.setMinOffsetMs(2)
.setMaxOffsetMs(3)
.setMinPlaybackSpeed(0.5f)
.setMaxPlaybackSpeed(1.5f)
.build();
window.isPlaceholder = true;
window.defaultPositionUs = 444;
window.durationUs = 555;

View file

@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.net.Uri;
import androidx.media3.common.C;
import androidx.media3.common.MediaItem;
import androidx.media3.common.MediaItem.SubtitleConfiguration;
import androidx.media3.common.MimeTypes;
import androidx.media3.common.Player;
import androidx.media3.common.text.Cue;
@ -47,15 +48,16 @@ public final class ClippedPlaybackTest {
MediaItem mediaItem =
new MediaItem.Builder()
.setUri("asset:///media/mp4/sample.mp4")
.setSubtitles(
.setSubtitleConfigurations(
ImmutableList.of(
new MediaItem.Subtitle(
Uri.parse("asset:///media/webvtt/typical"),
MimeTypes.TEXT_VTT,
"en",
C.SELECTION_FLAG_DEFAULT)))
new SubtitleConfiguration.Builder(Uri.parse("asset:///media/webvtt/typical"))
.setMimeType(MimeTypes.TEXT_VTT)
.setLanguage("en")
.setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.build()))
// Expect the clipping to affect both subtitles and video.
.setClipEndPositionMs(1000)
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setEndPositionMs(1000).build())
.build();
AtomicReference<ExoPlayer> player = new AtomicReference<>();
TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener();
@ -83,21 +85,24 @@ public final class ClippedPlaybackTest {
ImmutableList.of(
new MediaItem.Builder()
.setUri("asset:///media/mp4/sample.mp4")
.setSubtitles(
.setSubtitleConfigurations(
ImmutableList.of(
new MediaItem.Subtitle(
Uri.parse("asset:///media/webvtt/typical"),
MimeTypes.TEXT_VTT,
"en",
C.SELECTION_FLAG_DEFAULT)))
new SubtitleConfiguration.Builder(
Uri.parse("asset:///media/webvtt/typical"))
.setMimeType(MimeTypes.TEXT_VTT)
.setLanguage("en")
.setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.build()))
// Expect the clipping to affect both subtitles and video.
.setClipEndPositionMs(1000)
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setEndPositionMs(1000).build())
.build(),
new MediaItem.Builder()
.setUri("asset:///media/mp4/sample.mp4")
// Not needed for correctness, just makes test run faster. Must be longer than the
// subtitle content (3.5s).
.setClipEndPositionMs(4_000)
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setEndPositionMs(4_000).build())
.build());
AtomicReference<ExoPlayer> player = new AtomicReference<>();
TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener();

View file

@ -45,12 +45,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
assertThat(defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs()).isEqualTo(42_000);
}
@ -61,12 +62,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 4321,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(4321)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
assertThat(defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs()).isEqualTo(400_000);
}
@ -77,12 +79,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 3,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(3)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
assertThat(defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs()).isEqualTo(5_000);
}
@ -94,12 +97,13 @@ public class DefaultLivePlaybackSpeedControlTest {
defaultLivePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(321_000);
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
long targetLiveOffsetUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
@ -114,12 +118,13 @@ public class DefaultLivePlaybackSpeedControlTest {
defaultLivePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(123_456_789);
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
long targetLiveOffsetUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
@ -134,12 +139,13 @@ public class DefaultLivePlaybackSpeedControlTest {
defaultLivePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(3_141);
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
long targetLiveOffsetUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
@ -165,12 +171,13 @@ public class DefaultLivePlaybackSpeedControlTest {
new DefaultLivePlaybackSpeedControl.Builder().build();
defaultLivePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(123_456_789);
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
defaultLivePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(C.TIME_UNSET);
long targetLiveOffsetUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
@ -185,12 +192,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setTargetLiveOffsetIncrementOnRebufferMs(3)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
long targetLiveOffsetBeforeUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
defaultLivePlaybackSpeedControl.notifyRebuffer();
@ -207,12 +215,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setTargetLiveOffsetIncrementOnRebufferMs(3)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
List<Long> targetOffsetsUs = new ArrayList<>();
for (int i = 0; i < 500; i++) {
@ -232,12 +241,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setTargetLiveOffsetIncrementOnRebufferMs(0)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
defaultLivePlaybackSpeedControl.notifyRebuffer();
long targetLiveOffsetUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
@ -253,12 +263,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setTargetLiveOffsetIncrementOnRebufferMs(3)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
defaultLivePlaybackSpeedControl.notifyRebuffer();
defaultLivePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(321_000);
@ -275,22 +286,24 @@ public class DefaultLivePlaybackSpeedControlTest {
.setTargetLiveOffsetIncrementOnRebufferMs(3)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
long targetLiveOffsetBeforeUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
defaultLivePlaybackSpeedControl.notifyRebuffer();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 3,
/* maxLiveOffsetMs= */ 450,
/* minPlaybackSpeed= */ 0.9f,
/* maxPlaybackSpeed= */ 1.1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(3)
.setMaxOffsetMs(450)
.setMinPlaybackSpeed(0.9f)
.setMaxPlaybackSpeed(1.1f)
.build());
long targetLiveOffsetAfterUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
assertThat(targetLiveOffsetAfterUs).isGreaterThan(targetLiveOffsetBeforeUs);
@ -305,21 +318,23 @@ public class DefaultLivePlaybackSpeedControlTest {
.setTargetLiveOffsetIncrementOnRebufferMs(3)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42,
/* minLiveOffsetMs= */ 5,
/* maxLiveOffsetMs= */ 400,
/* minPlaybackSpeed= */ 1f,
/* maxPlaybackSpeed= */ 1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42)
.setMinOffsetMs(5)
.setMaxOffsetMs(400)
.setMinPlaybackSpeed(1f)
.setMaxPlaybackSpeed(1f)
.build());
defaultLivePlaybackSpeedControl.notifyRebuffer();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 39,
/* minLiveOffsetMs= */ 3,
/* maxLiveOffsetMs= */ 450,
/* minPlaybackSpeed= */ 0.9f,
/* maxPlaybackSpeed= */ 1.1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(39)
.setMinOffsetMs(3)
.setMaxOffsetMs(450)
.setMinPlaybackSpeed(0.9f)
.setMaxPlaybackSpeed(1.1f)
.build());
long targetLiveOffsetUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
assertThat(targetLiveOffsetUs).isEqualTo(39_000);
@ -334,12 +349,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setMinUpdateIntervalMs(100)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42_000,
/* minLiveOffsetMs= */ 5_000,
/* maxLiveOffsetMs= */ 400_000,
/* minPlaybackSpeed= */ 0.9f,
/* maxPlaybackSpeed= */ 1.1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42_000)
.setMinOffsetMs(5_000)
.setMaxOffsetMs(400_000)
.setMinPlaybackSpeed(0.9f)
.setMaxPlaybackSpeed(1.1f)
.build());
defaultLivePlaybackSpeedControl.notifyRebuffer();
long targetLiveOffsetAfterRebufferUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
@ -372,12 +388,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setMinUpdateIntervalMs(100)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42_000,
/* minLiveOffsetMs= */ 5_000,
/* maxLiveOffsetMs= */ 400_000,
/* minPlaybackSpeed= */ 0.9f,
/* maxPlaybackSpeed= */ 1.1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42_000)
.setMinOffsetMs(5_000)
.setMaxOffsetMs(400_000)
.setMinPlaybackSpeed(0.9f)
.setMaxPlaybackSpeed(1.1f)
.build());
defaultLivePlaybackSpeedControl.notifyRebuffer();
long targetLiveOffsetAfterRebufferUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
@ -409,12 +426,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42_000,
/* minLiveOffsetMs= */ 5_000,
/* maxLiveOffsetMs= */ 400_000,
/* minPlaybackSpeed= */ 0.9f,
/* maxPlaybackSpeed= */ 1.1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42_000)
.setMinOffsetMs(5_000)
.setMaxOffsetMs(400_000)
.setMinPlaybackSpeed(0.9f)
.setMaxPlaybackSpeed(1.1f)
.build());
long targetLiveOffsetBeforeUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
// Pretend to have a buffered duration at around the target duration with some artificial noise.
@ -441,12 +459,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setMinPossibleLiveOffsetSmoothingFactor(0f)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42_000,
/* minLiveOffsetMs= */ 5_000,
/* maxLiveOffsetMs= */ 400_000,
/* minPlaybackSpeed= */ 0.9f,
/* maxPlaybackSpeed= */ 1.1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42_000)
.setMinOffsetMs(5_000)
.setMaxOffsetMs(400_000)
.setMinPlaybackSpeed(0.9f)
.setMaxPlaybackSpeed(1.1f)
.build());
long targetLiveOffsetBeforeUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
// Pretend to have a buffered duration at around the target duration with some artificial noise.
@ -475,12 +494,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setMinUpdateIntervalMs(100)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 42_000,
/* minLiveOffsetMs= */ 5_000,
/* maxLiveOffsetMs= */ 400_000,
/* minPlaybackSpeed= */ 0.9f,
/* maxPlaybackSpeed= */ 1.1f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(42_000)
.setMinOffsetMs(5_000)
.setMaxOffsetMs(400_000)
.setMinPlaybackSpeed(0.9f)
.setMaxPlaybackSpeed(1.1f)
.build());
long targetLiveOffsetBeforeUs = defaultLivePlaybackSpeedControl.getTargetLiveOffsetUs();
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -496,12 +516,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -517,12 +538,13 @@ public class DefaultLivePlaybackSpeedControlTest {
.setMaxLiveOffsetErrorMsForUnitSpeed(5)
.build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeedJustAboveLowerErrorMargin =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -540,12 +562,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setProportionalControlFactor(0.01f).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -562,12 +585,13 @@ public class DefaultLivePlaybackSpeedControlTest {
new DefaultLivePlaybackSpeedControl.Builder().setProportionalControlFactor(0.01f).build();
defaultLivePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(2_000_000);
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -584,12 +608,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setFallbackMaxPlaybackSpeed(1.5f).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -604,12 +629,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setFallbackMinPlaybackSpeed(0.5f).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -624,12 +650,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setFallbackMaxPlaybackSpeed(1.5f).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ 2f));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(2f)
.build());
float adjustedSpeed =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -644,12 +671,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setFallbackMinPlaybackSpeed(0.5f).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ 0.2f,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(0.2f)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -663,12 +691,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setMinUpdateIntervalMs(123).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed1 =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -692,23 +721,25 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setMinUpdateIntervalMs(123).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed1 =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
/* liveOffsetUs= */ 1_500_000, /* bufferedDurationUs= */ 1_000_000);
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed2 =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
/* liveOffsetUs= */ 2_500_000, /* bufferedDurationUs= */ 1_000_000);
@ -722,23 +753,25 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setMinUpdateIntervalMs(123).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed1 =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
/* liveOffsetUs= */ 1_500_000, /* bufferedDurationUs= */ 1_000_000);
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 1_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(1_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed2 =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
/* liveOffsetUs= */ 2_500_000, /* bufferedDurationUs= */ 1_000_000);
@ -752,12 +785,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setMinUpdateIntervalMs(123).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed1 =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(
@ -775,12 +809,13 @@ public class DefaultLivePlaybackSpeedControlTest {
DefaultLivePlaybackSpeedControl defaultLivePlaybackSpeedControl =
new DefaultLivePlaybackSpeedControl.Builder().setMinUpdateIntervalMs(123).build();
defaultLivePlaybackSpeedControl.setLiveConfiguration(
new LiveConfiguration(
/* targetLiveOffsetMs= */ 2_000,
/* minLiveOffsetMs= */ C.TIME_UNSET,
/* maxLiveOffsetMs= */ C.TIME_UNSET,
/* minPlaybackSpeed= */ C.RATE_UNSET,
/* maxPlaybackSpeed= */ C.RATE_UNSET));
new LiveConfiguration.Builder()
.setTargetOffsetMs(2_000)
.setMinOffsetMs(C.TIME_UNSET)
.setMaxOffsetMs(C.TIME_UNSET)
.setMinPlaybackSpeed(C.RATE_UNSET)
.setMaxPlaybackSpeed(C.RATE_UNSET)
.build());
float adjustedSpeed1 =
defaultLivePlaybackSpeedControl.getAdjustedPlaybackSpeed(

View file

@ -93,12 +93,22 @@ public final class DefaultMediaSourceFactoryTest {
public void createMediaSource_withSubtitle_isMergingMediaSource() {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
List<MediaItem.Subtitle> subtitles =
List<MediaItem.SubtitleConfiguration> subtitleConfigurations =
Arrays.asList(
new MediaItem.Subtitle(Uri.parse(URI_TEXT), MimeTypes.APPLICATION_TTML, "en"),
new MediaItem.Subtitle(
Uri.parse(URI_TEXT), MimeTypes.APPLICATION_TTML, "de", C.SELECTION_FLAG_DEFAULT));
MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA).setSubtitles(subtitles).build();
new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_TEXT))
.setMimeType(MimeTypes.APPLICATION_TTML)
.setLanguage("en")
.build(),
new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_TEXT))
.setMimeType(MimeTypes.APPLICATION_TTML)
.setLanguage("de")
.setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.build());
MediaItem mediaItem =
new MediaItem.Builder()
.setUri(URI_MEDIA)
.setSubtitleConfigurations(subtitleConfigurations)
.build();
MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
@ -110,7 +120,11 @@ public final class DefaultMediaSourceFactoryTest {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem =
new MediaItem.Builder().setUri(URI_MEDIA).setClipStartPositionMs(1000L).build();
new MediaItem.Builder()
.setUri(URI_MEDIA)
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setStartPositionMs(1000L).build())
.build();
MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
@ -122,7 +136,11 @@ public final class DefaultMediaSourceFactoryTest {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem =
new MediaItem.Builder().setUri(URI_MEDIA).setClipEndPositionMs(1000L).build();
new MediaItem.Builder()
.setUri(URI_MEDIA)
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setEndPositionMs(1000L).build())
.build();
MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
@ -134,7 +152,13 @@ public final class DefaultMediaSourceFactoryTest {
DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem =
new MediaItem.Builder().setUri(URI_MEDIA).setClipRelativeToDefaultPosition(true).build();
new MediaItem.Builder()
.setUri(URI_MEDIA)
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder()
.setRelativeToDefaultPosition(true)
.build())
.build();
MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
@ -148,7 +172,10 @@ public final class DefaultMediaSourceFactoryTest {
MediaItem mediaItem =
new MediaItem.Builder()
.setUri(URI_MEDIA)
.setClipEndPositionMs(C.TIME_END_OF_SOURCE)
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder()
.setEndPositionMs(C.TIME_END_OF_SOURCE)
.build())
.build();
MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);

View file

@ -1055,8 +1055,13 @@ public final class DashMediaSource extends BaseMediaSource {
maxPlaybackSpeed = manifest.serviceDescription.maxPlaybackSpeed;
}
liveConfiguration =
new MediaItem.LiveConfiguration(
targetOffsetMs, minLiveOffsetMs, maxLiveOffsetMs, minPlaybackSpeed, maxPlaybackSpeed);
new MediaItem.LiveConfiguration.Builder()
.setTargetOffsetMs(targetOffsetMs)
.setMinOffsetMs(minLiveOffsetMs)
.setMaxOffsetMs(maxLiveOffsetMs)
.setMinPlaybackSpeed(minPlaybackSpeed)
.setMaxPlaybackSpeed(maxPlaybackSpeed)
.build();
}
private void scheduleManifestRefresh(long delayUntilNextLoadMs) {