Skip to content

SDK / exoplayer

Go to a project
Commit 5b28cb52 by bachinger Committed by Andrew Lewis
Options

Add getMediaItem() to MediaSource 

This change adds MediaSource.getMediaItem and deprecates MediaSource.getTag. For backwards compatibility, the tag is made available through the Window with `mediaItem.playbackProperties.tag` as well as in the deprecated `tag` attribute.

PiperOrigin-RevId: 316539752
parent 9719b66d
Inline Side-by-side
Showing with 165 additions and 27 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
...@@ -184,6 +185,11 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> { ...@@ -184,6 +185,11 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
window = new Timeline.Window(); window = new Timeline.Window();
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
...@@ -191,6 +197,11 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> { ...@@ -191,6 +197,11 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
} }
@Override @Override
public MediaItem getMediaItem() {
return mediaSource.getMediaItem();
}
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
prepareChildSource(/* id= */ null, mediaSource); prepareChildSource(/* id= */ null, mediaSource);
......
library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
...@@ -442,7 +442,7 @@ public final class ConcatenatingMediaSource extends CompositeMediaSource<MediaSo ...@@ -442,7 +442,7 @@ public final class ConcatenatingMediaSource extends CompositeMediaSource<MediaSo
// CompositeMediaSource implementation. // CompositeMediaSource implementation.
// TODO(bachinger): add @Override annotation once the method is defined by MediaSource. @Override
public MediaItem getMediaItem() { public MediaItem getMediaItem() {
// This method is actually never called because getInitialTimeline is implemented and hence the // This method is actually never called because getInitialTimeline is implemented and hence the
// MaskingMediaSource does not need to create a dummy timeline for this media source. // MaskingMediaSource does not need to create a dummy timeline for this media source.
...@@ -996,7 +996,7 @@ public final class ConcatenatingMediaSource extends CompositeMediaSource<MediaSo ...@@ -996,7 +996,7 @@ public final class ConcatenatingMediaSource extends CompositeMediaSource<MediaSo
// Do nothing. // Do nothing.
} }
// TODO(bachinger): add @Override annotation once the method is defined by MediaSource. @Override
public MediaItem getMediaItem() { public MediaItem getMediaItem() {
return DUMMY_MEDIA_ITEM; return DUMMY_MEDIA_ITEM;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
...@@ -333,6 +333,11 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> { ...@@ -333,6 +333,11 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
continueLoadingCheckIntervalBytes); continueLoadingCheckIntervalBytes);
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
...@@ -340,6 +345,11 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> { ...@@ -340,6 +345,11 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
} }
@Override @Override
public MediaItem getMediaItem() {
return progressiveMediaSource.getMediaItem();
}
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
prepareChildSource(/* id= */ null, progressiveMediaSource); prepareChildSource(/* id= */ null, progressiveMediaSource);
......
library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
...@@ -19,6 +19,7 @@ import androidx.annotation.Nullable; ...@@ -19,6 +19,7 @@ import androidx.annotation.Nullable;
import com.google.android.exoplayer2.AbstractConcatenatedTimeline; import com.google.android.exoplayer2.AbstractConcatenatedTimeline;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder; import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
...@@ -65,6 +66,11 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> { ...@@ -65,6 +66,11 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
mediaPeriodToChildMediaPeriodId = new HashMap<>(); mediaPeriodToChildMediaPeriodId = new HashMap<>();
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
...@@ -72,6 +78,11 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> { ...@@ -72,6 +78,11 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
} }
@Override @Override
public MediaItem getMediaItem() {
return maskingMediaSource.getMediaItem();
}
@Override
@Nullable @Nullable
public Timeline getInitialTimeline() { public Timeline getInitialTimeline() {
return loopCount != Integer.MAX_VALUE return loopCount != Integer.MAX_VALUE
......
library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
package com.google.android.exoplayer2.source; package com.google.android.exoplayer2.source;
import android.net.Uri;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
...@@ -68,10 +67,7 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> { ...@@ -68,10 +67,7 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> {
initialTimeline, /* firstWindowUid= */ null, /* firstPeriodUid= */ null); initialTimeline, /* firstWindowUid= */ null, /* firstPeriodUid= */ null);
hasRealTimeline = true; hasRealTimeline = true;
} else { } else {
// TODO(bachinger) Use mediasSource.getMediaItem() to provide the media item. timeline = MaskingTimeline.createWithDummyTimeline(mediaSource.getMediaItem());
timeline =
MaskingTimeline.createWithDummyTimeline(
new MediaItem.Builder().setUri(Uri.EMPTY).setTag(mediaSource.getTag()).build());
} }
} }
...@@ -89,6 +85,11 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> { ...@@ -89,6 +85,11 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> {
} }
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
...@@ -96,6 +97,11 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> { ...@@ -96,6 +97,11 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> {
} }
@Override @Override
public MediaItem getMediaItem() {
return mediaSource.getMediaItem();
}
@Override
@SuppressWarnings("MissingSuperCall") @SuppressWarnings("MissingSuperCall")
public void maybeThrowSourceInfoRefreshError() { public void maybeThrowSourceInfoRefreshError() {
// Do nothing. Source info refresh errors will be thrown when calling // Do nothing. Source info refresh errors will be thrown when calling
......
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source;
import android.os.Handler; import android.os.Handler;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Allocator;
...@@ -273,12 +274,18 @@ public interface MediaSource { ...@@ -273,12 +274,18 @@ public interface MediaSource {
return true; return true;
} }
/** Returns the tag set on the media source, or null if none was set. */ /**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@Deprecated
@Nullable @Nullable
default Object getTag() { default Object getTag() {
return null; return null;
} }
/** Returns the {@link MediaItem} whose media is provided by the source. */
MediaItem getMediaItem();
/** /**
* Registers a {@link MediaSourceCaller}. Starts source preparation if needed and enables the * Registers a {@link MediaSourceCaller}. Starts source preparation if needed and enables the
* source for the creation of {@link MediaPeriod MediaPerods}. * source for the creation of {@link MediaPeriod MediaPerods}.
......
library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
...@@ -65,6 +66,8 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> { ...@@ -65,6 +66,8 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
} }
private static final int PERIOD_COUNT_UNSET = -1; private static final int PERIOD_COUNT_UNSET = -1;
private static final MediaItem DUMMY_MEDIA_ITEM =
new MediaItem.Builder().setMediaId("MergingMediaSource").build();
private final boolean adjustPeriodTimeOffsets; private final boolean adjustPeriodTimeOffsets;
private final MediaSource[] mediaSources; private final MediaSource[] mediaSources;
...@@ -121,6 +124,11 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> { ...@@ -121,6 +124,11 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
periodTimeOffsetsUs = new long[0][]; periodTimeOffsetsUs = new long[0][];
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
...@@ -128,6 +136,11 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> { ...@@ -128,6 +136,11 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
} }
@Override @Override
public MediaItem getMediaItem() {
return mediaSources.length > 0 ? mediaSources[0].getMediaItem() : DUMMY_MEDIA_ITEM;
}
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
for (int i = 0; i < mediaSources.length; i++) { for (int i = 0; i < mediaSources.length; i++) {
......
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
...@@ -244,14 +244,19 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -244,14 +244,19 @@ public final class ProgressiveMediaSource extends BaseMediaSource
this.timelineDurationUs = C.TIME_UNSET; this.timelineDurationUs = C.TIME_UNSET;
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
return playbackProperties.tag; return playbackProperties.tag;
} }
@Nullable @Override
public Object getMediaItem() { public MediaItem getMediaItem() {
return mediaItem; return mediaItem;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
...@@ -77,7 +77,7 @@ public final class SilenceMediaSource extends BaseMediaSource { ...@@ -77,7 +77,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
} }
/** The media id used by any media item of silence media sources. */ /** The media id used by any media item of silence media sources. */
public static final String MEDIA_ID = "com.google.android.exoplayer2.source.SilenceMediaSource"; public static final String MEDIA_ID = "SilenceMediaSource";
private static final int SAMPLE_RATE_HZ = 44100; private static final int SAMPLE_RATE_HZ = 44100;
@C.PcmEncoding private static final int PCM_ENCODING = C.ENCODING_PCM_16BIT; @C.PcmEncoding private static final int PCM_ENCODING = C.ENCODING_PCM_16BIT;
...@@ -145,12 +145,11 @@ public final class SilenceMediaSource extends BaseMediaSource { ...@@ -145,12 +145,11 @@ public final class SilenceMediaSource extends BaseMediaSource {
@Override @Override
public void releasePeriod(MediaPeriod mediaPeriod) {} public void releasePeriod(MediaPeriod mediaPeriod) {}
/** Returns the {@link MediaItem} of this media source. */ /**
// TODO(bachinger): add @Override annotation once the method is defined by MediaSource. * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
public MediaItem getMediaItem() { */
return mediaItem; @SuppressWarnings("deprecation")
} @Deprecated
@Nullable @Nullable
@Override @Override
public Object getTag() { public Object getTag() {
...@@ -158,6 +157,11 @@ public final class SilenceMediaSource extends BaseMediaSource { ...@@ -158,6 +157,11 @@ public final class SilenceMediaSource extends BaseMediaSource {
} }
@Override @Override
public MediaItem getMediaItem() {
return mediaItem;
}
@Override
protected void releaseSourceInternal() {} protected void releaseSourceInternal() {}
private static final class SilenceMediaPeriod implements MediaPeriod { private static final class SilenceMediaPeriod implements MediaPeriod {
......
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
...@@ -294,13 +294,18 @@ public final class SingleSampleMediaSource extends BaseMediaSource { ...@@ -294,13 +294,18 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
// MediaSource implementation. // MediaSource implementation.
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
return castNonNull(mediaItem.playbackProperties).tag; return castNonNull(mediaItem.playbackProperties).tag;
} }
// TODO(bachinger) Add @Override annotation once the method is defined by MediaSource. @Override
public MediaItem getMediaItem() { public MediaItem getMediaItem() {
return mediaItem; return mediaItem;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
...@@ -22,6 +22,7 @@ import android.os.SystemClock; ...@@ -22,6 +22,7 @@ import android.os.SystemClock;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.source.CompositeMediaSource; import com.google.android.exoplayer2.source.CompositeMediaSource;
import com.google.android.exoplayer2.source.LoadEventInfo; import com.google.android.exoplayer2.source.LoadEventInfo;
...@@ -181,6 +182,11 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -181,6 +182,11 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
adsLoader.setSupportedContentTypes(adMediaSourceFactory.getSupportedTypes()); adsLoader.setSupportedContentTypes(adMediaSourceFactory.getSupportedTypes());
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
...@@ -188,6 +194,11 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -188,6 +194,11 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
} }
@Override @Override
public MediaItem getMediaItem() {
return contentMediaSource.getMediaItem();
}
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
ComponentListener componentListener = new ComponentListener(); ComponentListener componentListener = new ComponentListener();
......
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -140,7 +140,7 @@ public final class ExoPlayerTest { ...@@ -140,7 +140,7 @@ public final class ExoPlayerTest {
public void playEmptyTimeline() throws Exception { public void playEmptyTimeline() throws Exception {
Timeline timeline = Timeline.EMPTY; Timeline timeline = Timeline.EMPTY;
Timeline expectedMaskingTimeline = Timeline expectedMaskingTimeline =
new MaskingMediaSource.DummyTimeline(FakeTimeline.FAKE_MEDIA_ITEM); new MaskingMediaSource.DummyTimeline(FakeMediaSource.FAKE_MEDIA_ITEM);
FakeRenderer renderer = new FakeRenderer(C.TRACK_TYPE_UNKNOWN); FakeRenderer renderer = new FakeRenderer(C.TRACK_TYPE_UNKNOWN);
ExoPlayerTestRunner testRunner = ExoPlayerTestRunner testRunner =
new ExoPlayerTestRunner.Builder(context) new ExoPlayerTestRunner.Builder(context)
...@@ -3446,6 +3446,11 @@ public final class ExoPlayerTest { ...@@ -3446,6 +3446,11 @@ public final class ExoPlayerTest {
} }
@Override @Override
public MediaItem getMediaItem() {
return underlyingSource.getMediaItem();
}
@Override
@Nullable @Nullable
public Timeline getInitialTimeline() { public Timeline getInitialTimeline() {
return Timeline.EMPTY; return Timeline.EMPTY;
......
library/core/src/test/java/com/google/android/exoplayer2/MediaSourceListTest.java
...@@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.isNull; ...@@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
...@@ -42,6 +43,8 @@ import org.junit.runner.RunWith; ...@@ -42,6 +43,8 @@ import org.junit.runner.RunWith;
public class MediaSourceListTest { public class MediaSourceListTest {
private static final int MEDIA_SOURCE_LIST_SIZE = 4; private static final int MEDIA_SOURCE_LIST_SIZE = 4;
private static final MediaItem MINIMAL_MEDIA_ITEM =
new MediaItem.Builder().setMediaId("").build();
private MediaSourceList mediaSourceList; private MediaSourceList mediaSourceList;
...@@ -76,7 +79,9 @@ public class MediaSourceListTest { ...@@ -76,7 +79,9 @@ public class MediaSourceListTest {
@Test @Test
public void prepareAndReprepareAfterRelease_expectSourcePreparationAfterMediaSourceListPrepare() { public void prepareAndReprepareAfterRelease_expectSourcePreparationAfterMediaSourceListPrepare() {
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
mediaSourceList.setMediaSources( mediaSourceList.setMediaSources(
createFakeHoldersWithSources( createFakeHoldersWithSources(
/* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2), /* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2),
...@@ -115,7 +120,9 @@ public class MediaSourceListTest { ...@@ -115,7 +120,9 @@ public class MediaSourceListTest {
ShuffleOrder.DefaultShuffleOrder shuffleOrder = ShuffleOrder.DefaultShuffleOrder shuffleOrder =
new ShuffleOrder.DefaultShuffleOrder(/* length= */ 2); new ShuffleOrder.DefaultShuffleOrder(/* length= */ 2);
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
List<MediaSourceList.MediaSourceHolder> mediaSources = List<MediaSourceList.MediaSourceHolder> mediaSources =
createFakeHoldersWithSources( createFakeHoldersWithSources(
/* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2); /* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2);
...@@ -132,8 +139,10 @@ public class MediaSourceListTest { ...@@ -132,8 +139,10 @@ public class MediaSourceListTest {
} }
// Set media items again. The second holder is re-used. // Set media items again. The second holder is re-used.
MediaSource mockMediaSource3 = mock(MediaSource.class);
when(mockMediaSource3.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
List<MediaSourceList.MediaSourceHolder> moreMediaSources = List<MediaSourceList.MediaSourceHolder> moreMediaSources =
createFakeHoldersWithSources(/* useLazyPreparation= */ false, mock(MediaSource.class)); createFakeHoldersWithSources(/* useLazyPreparation= */ false, mockMediaSource3);
moreMediaSources.add(mediaSources.get(1)); moreMediaSources.add(mediaSources.get(1));
timeline = mediaSourceList.setMediaSources(moreMediaSources, shuffleOrder); timeline = mediaSourceList.setMediaSources(moreMediaSources, shuffleOrder);
...@@ -157,7 +166,9 @@ public class MediaSourceListTest { ...@@ -157,7 +166,9 @@ public class MediaSourceListTest {
ShuffleOrder.DefaultShuffleOrder shuffleOrder = ShuffleOrder.DefaultShuffleOrder shuffleOrder =
new ShuffleOrder.DefaultShuffleOrder(/* length= */ 2); new ShuffleOrder.DefaultShuffleOrder(/* length= */ 2);
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
List<MediaSourceList.MediaSourceHolder> mediaSources = List<MediaSourceList.MediaSourceHolder> mediaSources =
createFakeHoldersWithSources( createFakeHoldersWithSources(
/* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2); /* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2);
...@@ -174,8 +185,10 @@ public class MediaSourceListTest { ...@@ -174,8 +185,10 @@ public class MediaSourceListTest {
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull());
// Set media items again. The second holder is re-used. // Set media items again. The second holder is re-used.
MediaSource mockMediaSource3 = mock(MediaSource.class);
when(mockMediaSource3.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
List<MediaSourceList.MediaSourceHolder> moreMediaSources = List<MediaSourceList.MediaSourceHolder> moreMediaSources =
createFakeHoldersWithSources(/* useLazyPreparation= */ false, mock(MediaSource.class)); createFakeHoldersWithSources(/* useLazyPreparation= */ false, mockMediaSource3);
moreMediaSources.add(mediaSources.get(1)); moreMediaSources.add(mediaSources.get(1));
mediaSourceList.setMediaSources(moreMediaSources, shuffleOrder); mediaSourceList.setMediaSources(moreMediaSources, shuffleOrder);
...@@ -193,7 +206,9 @@ public class MediaSourceListTest { ...@@ -193,7 +206,9 @@ public class MediaSourceListTest {
@Test @Test
public void addMediaSources_mediaSourceListUnprepared_notUsingLazyPreparation_expectUnprepared() { public void addMediaSources_mediaSourceListUnprepared_notUsingLazyPreparation_expectUnprepared() {
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
List<MediaSourceList.MediaSourceHolder> mediaSources = List<MediaSourceList.MediaSourceHolder> mediaSources =
createFakeHoldersWithSources( createFakeHoldersWithSources(
/* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2); /* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2);
...@@ -228,7 +243,9 @@ public class MediaSourceListTest { ...@@ -228,7 +243,9 @@ public class MediaSourceListTest {
@Test @Test
public void addMediaSources_mediaSourceListPrepared_notUsingLazyPreparation_expectPrepared() { public void addMediaSources_mediaSourceListPrepared_notUsingLazyPreparation_expectPrepared() {
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
mediaSourceList.prepare(/* mediaTransferListener= */ null); mediaSourceList.prepare(/* mediaTransferListener= */ null);
mediaSourceList.addMediaSources( mediaSourceList.addMediaSources(
/* index= */ 0, /* index= */ 0,
...@@ -287,9 +304,13 @@ public class MediaSourceListTest { ...@@ -287,9 +304,13 @@ public class MediaSourceListTest {
@Test @Test
public void removeMediaSources_whenUnprepared_expectNoRelease() { public void removeMediaSources_whenUnprepared_expectNoRelease() {
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource3 = mock(MediaSource.class); MediaSource mockMediaSource3 = mock(MediaSource.class);
when(mockMediaSource3.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource4 = mock(MediaSource.class); MediaSource mockMediaSource4 = mock(MediaSource.class);
when(mockMediaSource4.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
ShuffleOrder.DefaultShuffleOrder shuffleOrder = ShuffleOrder.DefaultShuffleOrder shuffleOrder =
new ShuffleOrder.DefaultShuffleOrder(/* length= */ 4); new ShuffleOrder.DefaultShuffleOrder(/* length= */ 4);
...@@ -319,9 +340,13 @@ public class MediaSourceListTest { ...@@ -319,9 +340,13 @@ public class MediaSourceListTest {
@Test @Test
public void removeMediaSources_whenPrepared_expectRelease() { public void removeMediaSources_whenPrepared_expectRelease() {
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource3 = mock(MediaSource.class); MediaSource mockMediaSource3 = mock(MediaSource.class);
when(mockMediaSource3.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource4 = mock(MediaSource.class); MediaSource mockMediaSource4 = mock(MediaSource.class);
when(mockMediaSource4.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
ShuffleOrder.DefaultShuffleOrder shuffleOrder = ShuffleOrder.DefaultShuffleOrder shuffleOrder =
new ShuffleOrder.DefaultShuffleOrder(/* length= */ 4); new ShuffleOrder.DefaultShuffleOrder(/* length= */ 4);
...@@ -350,6 +375,7 @@ public class MediaSourceListTest { ...@@ -350,6 +375,7 @@ public class MediaSourceListTest {
@Test @Test
public void release_mediaSourceListUnprepared_expectSourcesNotReleased() { public void release_mediaSourceListUnprepared_expectSourcesNotReleased() {
MediaSource mockMediaSource = mock(MediaSource.class); MediaSource mockMediaSource = mock(MediaSource.class);
when(mockMediaSource.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSourceList.MediaSourceHolder mediaSourceHolder = MediaSourceList.MediaSourceHolder mediaSourceHolder =
new MediaSourceList.MediaSourceHolder(mockMediaSource, /* useLazyPreparation= */ false); new MediaSourceList.MediaSourceHolder(mockMediaSource, /* useLazyPreparation= */ false);
...@@ -367,6 +393,7 @@ public class MediaSourceListTest { ...@@ -367,6 +393,7 @@ public class MediaSourceListTest {
@Test @Test
public void release_mediaSourceListPrepared_expectSourcesReleasedNotRemoved() { public void release_mediaSourceListPrepared_expectSourcesReleasedNotRemoved() {
MediaSource mockMediaSource = mock(MediaSource.class); MediaSource mockMediaSource = mock(MediaSource.class);
when(mockMediaSource.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSourceList.MediaSourceHolder mediaSourceHolder = MediaSourceList.MediaSourceHolder mediaSourceHolder =
new MediaSourceList.MediaSourceHolder(mockMediaSource, /* useLazyPreparation= */ false); new MediaSourceList.MediaSourceHolder(mockMediaSource, /* useLazyPreparation= */ false);
...@@ -387,7 +414,9 @@ public class MediaSourceListTest { ...@@ -387,7 +414,9 @@ public class MediaSourceListTest {
ShuffleOrder.DefaultShuffleOrder shuffleOrder = ShuffleOrder.DefaultShuffleOrder shuffleOrder =
new ShuffleOrder.DefaultShuffleOrder(/* length= */ 4); new ShuffleOrder.DefaultShuffleOrder(/* length= */ 4);
MediaSource mockMediaSource1 = mock(MediaSource.class); MediaSource mockMediaSource1 = mock(MediaSource.class);
when(mockMediaSource1.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
MediaSource mockMediaSource2 = mock(MediaSource.class); MediaSource mockMediaSource2 = mock(MediaSource.class);
when(mockMediaSource2.getMediaItem()).thenReturn(MINIMAL_MEDIA_ITEM);
List<MediaSourceList.MediaSourceHolder> holders = List<MediaSourceList.MediaSourceHolder> holders =
createFakeHoldersWithSources( createFakeHoldersWithSources(
/* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2); /* useLazyPreparation= */ false, mockMediaSource1, mockMediaSource2);
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
...@@ -655,13 +655,18 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -655,13 +655,18 @@ public final class DashMediaSource extends BaseMediaSource {
// MediaSource implementation. // MediaSource implementation.
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
return playbackProperties.tag; return playbackProperties.tag;
} }
// TODO(bachinger): add @Override annotation once the method is defined by MediaSource. @Override
public MediaItem getMediaItem() { public MediaItem getMediaItem() {
return mediaItem; return mediaItem;
} }
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
...@@ -425,13 +425,18 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -425,13 +425,18 @@ public final class HlsMediaSource extends BaseMediaSource
this.useSessionKeys = useSessionKeys; this.useSessionKeys = useSessionKeys;
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
return playbackProperties.tag; return playbackProperties.tag;
} }
// TODO(bachinger): add @Override annotation once the method is defined by MediaSource. @Override
public MediaItem getMediaItem() { public MediaItem getMediaItem() {
return mediaItem; return mediaItem;
} }
......
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
...@@ -593,13 +593,18 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -593,13 +593,18 @@ public final class SsMediaSource extends BaseMediaSource
// MediaSource implementation. // MediaSource implementation.
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
return playbackProperties.tag; return playbackProperties.tag;
} }
// TODO(bachinger): add @Override annotation once the method is defined by MediaSource. @Override
public MediaItem getMediaItem() { public MediaItem getMediaItem() {
return mediaItem; return mediaItem;
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
...@@ -71,7 +71,7 @@ public class FakeMediaSource extends BaseMediaSource { ...@@ -71,7 +71,7 @@ public class FakeMediaSource extends BaseMediaSource {
/** The media item used by the fake media source. */ /** The media item used by the fake media source. */
public static final MediaItem FAKE_MEDIA_ITEM = public static final MediaItem FAKE_MEDIA_ITEM =
new MediaItem.Builder().setUri("http://manifest.uri").build(); new MediaItem.Builder().setMediaId("FakeMediaSource").setUri("http://manifest.uri").build();
private static final DataSpec FAKE_DATA_SPEC = private static final DataSpec FAKE_DATA_SPEC =
new DataSpec(castNonNull(FAKE_MEDIA_ITEM.playbackProperties).uri); new DataSpec(castNonNull(FAKE_MEDIA_ITEM.playbackProperties).uri);
...@@ -134,6 +134,11 @@ public class FakeMediaSource extends BaseMediaSource { ...@@ -134,6 +134,11 @@ public class FakeMediaSource extends BaseMediaSource {
return timeline; return timeline;
} }
/**
* @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
@Override @Override
@Nullable @Nullable
public Object getTag() { public Object getTag() {
...@@ -143,7 +148,7 @@ public class FakeMediaSource extends BaseMediaSource { ...@@ -143,7 +148,7 @@ public class FakeMediaSource extends BaseMediaSource {
return timeline.getWindow(0, new Timeline.Window()).tag; return timeline.getWindow(0, new Timeline.Window()).tag;
} }
// TODO(bachinger): add @Override annotation once the method is defined by MediaSource. @Override
public MediaItem getMediaItem() { public MediaItem getMediaItem() {
if (timeline == null || timeline.isEmpty()) { if (timeline == null || timeline.isEmpty()) {
return FAKE_MEDIA_ITEM; return FAKE_MEDIA_ITEM;
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
...@@ -184,7 +184,8 @@ public final class FakeTimeline extends Timeline { ...@@ -184,7 +184,8 @@ public final class FakeTimeline extends Timeline {
} }
/** The fake media item used by the fake timeline. */ /** The fake media item used by the fake timeline. */
public static final MediaItem FAKE_MEDIA_ITEM = new MediaItem.Builder().setUri(Uri.EMPTY).build(); public static final MediaItem FAKE_MEDIA_ITEM =
new MediaItem.Builder().setMediaId("FakeTimeline").setUri(Uri.EMPTY).build();
private static final long AD_DURATION_US = 10 * C.MICROS_PER_SECOND; private static final long AD_DURATION_US = 10 * C.MICROS_PER_SECOND;
......
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