Skip to content

SDK / exoplayer

Go to a project
Commit e5fc7141 by ibaker Committed by tonihei
Options

Migrate usages of deprecated MediaItem symbols 

#minor-release

PiperOrigin-RevId: 407847729
parent 1f0fbafd
Expand all
Inline Side-by-side
Showing with 75 additions and 34 deletions
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/DefaultMediaItemConverter.java
...@@ -88,8 +88,11 @@ public class DefaultMediaItemConverter implements MediaItemConverter { ...@@ -88,8 +88,11 @@ public class DefaultMediaItemConverter implements MediaItemConverter {
.setMediaId(mediaId != null ? mediaId : MediaItem.DEFAULT_MEDIA_ID) .setMediaId(mediaId != null ? mediaId : MediaItem.DEFAULT_MEDIA_ID)
.setMediaMetadata(new MediaMetadata.Builder().setTitle(title).build()) .setMediaMetadata(new MediaMetadata.Builder().setTitle(title).build())
.setTag(media2MediaItem) .setTag(media2MediaItem)
.setClipStartPositionMs(startPositionMs) .setClippingConfiguration(
.setClipEndPositionMs(endPositionMs) new MediaItem.ClippingConfiguration.Builder()
.setStartPositionMs(startPositionMs)
.setEndPositionMs(endPositionMs)
.build())
.build(); .build();
} }
......
library/common/src/test/java/com/google/android/exoplayer2/TimelineTest.java
...@@ -301,12 +301,13 @@ public class TimelineTest { ...@@ -301,12 +301,13 @@ public class TimelineTest {
window.isSeekable = true; window.isSeekable = true;
window.isDynamic = true; window.isDynamic = true;
window.liveConfiguration = window.liveConfiguration =
new LiveConfiguration( new LiveConfiguration.Builder()
/* targetOffsetMs= */ 1, .setTargetOffsetMs(1)
/* minOffsetMs= */ 2, .setMinOffsetMs(2)
/* maxOffsetMs= */ 3, .setMaxOffsetMs(3)
/* minPlaybackSpeed= */ 0.5f, .setMinPlaybackSpeed(0.5f)
/* maxPlaybackSpeed= */ 1.5f); .setMaxPlaybackSpeed(1.5f)
.build();
window.isPlaceholder = true; window.isPlaceholder = true;
window.defaultPositionUs = 444; window.defaultPositionUs = 444;
window.durationUs = 555; window.durationUs = 555;
......
library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java
...@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.net.Uri; import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.MediaItem.SubtitleConfiguration;
import com.google.android.exoplayer2.source.ClippingMediaSource; import com.google.android.exoplayer2.source.ClippingMediaSource;
import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Cue;
import com.google.android.exoplayer2.util.ConditionVariable; import com.google.android.exoplayer2.util.ConditionVariable;
...@@ -44,15 +45,16 @@ public final class ClippedPlaybackTest { ...@@ -44,15 +45,16 @@ public final class ClippedPlaybackTest {
MediaItem mediaItem = MediaItem mediaItem =
new MediaItem.Builder() new MediaItem.Builder()
.setUri("asset:///media/mp4/sample.mp4") .setUri("asset:///media/mp4/sample.mp4")
.setSubtitles( .setSubtitleConfigurations(
ImmutableList.of( ImmutableList.of(
new MediaItem.Subtitle( new SubtitleConfiguration.Builder(Uri.parse("asset:///media/webvtt/typical"))
Uri.parse("asset:///media/webvtt/typical"), .setMimeType(MimeTypes.TEXT_VTT)
MimeTypes.TEXT_VTT, .setLanguage("en")
"en", .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
C.SELECTION_FLAG_DEFAULT))) .build()))
// Expect the clipping to affect both subtitles and video. // Expect the clipping to affect both subtitles and video.
.setClipEndPositionMs(1000) .setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setEndPositionMs(1000).build())
.build(); .build();
AtomicReference<ExoPlayer> player = new AtomicReference<>(); AtomicReference<ExoPlayer> player = new AtomicReference<>();
TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener(); TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener();
...@@ -80,21 +82,24 @@ public final class ClippedPlaybackTest { ...@@ -80,21 +82,24 @@ public final class ClippedPlaybackTest {
ImmutableList.of( ImmutableList.of(
new MediaItem.Builder() new MediaItem.Builder()
.setUri("asset:///media/mp4/sample.mp4") .setUri("asset:///media/mp4/sample.mp4")
.setSubtitles( .setSubtitleConfigurations(
ImmutableList.of( ImmutableList.of(
new MediaItem.Subtitle( new SubtitleConfiguration.Builder(
Uri.parse("asset:///media/webvtt/typical"), Uri.parse("asset:///media/webvtt/typical"))
MimeTypes.TEXT_VTT, .setMimeType(MimeTypes.TEXT_VTT)
"en", .setLanguage("en")
C.SELECTION_FLAG_DEFAULT))) .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.build()))
// Expect the clipping to affect both subtitles and video. // Expect the clipping to affect both subtitles and video.
.setClipEndPositionMs(1000) .setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setEndPositionMs(1000).build())
.build(), .build(),
new MediaItem.Builder() new MediaItem.Builder()
.setUri("asset:///media/mp4/sample.mp4") .setUri("asset:///media/mp4/sample.mp4")
// Not needed for correctness, just makes test run faster. Must be longer than the // Not needed for correctness, just makes test run faster. Must be longer than the
// subtitle content (3.5s). // subtitle content (3.5s).
.setClipEndPositionMs(4_000) .setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder().setEndPositionMs(4_000).build())
.build()); .build());
AtomicReference<ExoPlayer> player = new AtomicReference<>(); AtomicReference<ExoPlayer> player = new AtomicReference<>();
TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener(); TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener();
......
library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java
...@@ -93,12 +93,22 @@ public final class DefaultMediaSourceFactoryTest { ...@@ -93,12 +93,22 @@ public final class DefaultMediaSourceFactoryTest {
public void createMediaSource_withSubtitle_isMergingMediaSource() { public void createMediaSource_withSubtitle_isMergingMediaSource() {
DefaultMediaSourceFactory defaultMediaSourceFactory = DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()); new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
List<MediaItem.Subtitle> subtitles = List<MediaItem.SubtitleConfiguration> subtitleConfigurations =
Arrays.asList( Arrays.asList(
new MediaItem.Subtitle(Uri.parse(URI_TEXT), MimeTypes.APPLICATION_TTML, "en"), new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_TEXT))
new MediaItem.Subtitle( .setMimeType(MimeTypes.APPLICATION_TTML)
Uri.parse(URI_TEXT), MimeTypes.APPLICATION_TTML, "de", C.SELECTION_FLAG_DEFAULT)); .setLanguage("en")
MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA).setSubtitles(subtitles).build(); .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); MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
...@@ -110,7 +120,11 @@ public final class DefaultMediaSourceFactoryTest { ...@@ -110,7 +120,11 @@ public final class DefaultMediaSourceFactoryTest {
DefaultMediaSourceFactory defaultMediaSourceFactory = DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()); new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem = 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); MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
...@@ -122,7 +136,11 @@ public final class DefaultMediaSourceFactoryTest { ...@@ -122,7 +136,11 @@ public final class DefaultMediaSourceFactoryTest {
DefaultMediaSourceFactory defaultMediaSourceFactory = DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()); new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem = 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); MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
...@@ -134,7 +152,13 @@ public final class DefaultMediaSourceFactoryTest { ...@@ -134,7 +152,13 @@ public final class DefaultMediaSourceFactoryTest {
DefaultMediaSourceFactory defaultMediaSourceFactory = DefaultMediaSourceFactory defaultMediaSourceFactory =
new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext()); new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
MediaItem mediaItem = 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); MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
...@@ -148,7 +172,10 @@ public final class DefaultMediaSourceFactoryTest { ...@@ -148,7 +172,10 @@ public final class DefaultMediaSourceFactoryTest {
MediaItem mediaItem = MediaItem mediaItem =
new MediaItem.Builder() new MediaItem.Builder()
.setUri(URI_MEDIA) .setUri(URI_MEDIA)
.setClipEndPositionMs(C.TIME_END_OF_SOURCE) .setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder()
.setEndPositionMs(C.TIME_END_OF_SOURCE)
.build())
.build(); .build();
MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem); MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
...@@ -1053,8 +1053,13 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -1053,8 +1053,13 @@ public final class DashMediaSource extends BaseMediaSource {
maxPlaybackSpeed = manifest.serviceDescription.maxPlaybackSpeed; maxPlaybackSpeed = manifest.serviceDescription.maxPlaybackSpeed;
} }
liveConfiguration = liveConfiguration =
new MediaItem.LiveConfiguration( new MediaItem.LiveConfiguration.Builder()
targetOffsetMs, minLiveOffsetMs, maxLiveOffsetMs, minPlaybackSpeed, maxPlaybackSpeed); .setTargetOffsetMs(targetOffsetMs)
.setMinOffsetMs(minLiveOffsetMs)
.setMaxOffsetMs(maxLiveOffsetMs)
.setMinPlaybackSpeed(minPlaybackSpeed)
.setMaxPlaybackSpeed(maxPlaybackSpeed)
.build();
} }
private void scheduleManifestRefresh(long delayUntilNextLoadMs) { private void scheduleManifestRefresh(long delayUntilNextLoadMs) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment