Skip to content

SDK / exoplayer

Go to a project
Commit 658def41 by tonihei
Options

Plumb PlayerId to MediaSource. 

MediaSource can be reused with other Player instances after they
have been released, so we need to set the PlayerId when preparing
the source. Access can mostly be handled by the implementation in
BaseMediaSource.

PiperOrigin-RevId: 408878824
parent bf1cf13c
Inline Side-by-side
Showing with 104 additions and 39 deletions
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
...@@ -268,7 +268,8 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -268,7 +268,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
Handler eventHandler = new Handler(applicationLooper); Handler eventHandler = new Handler(applicationLooper);
queue = new MediaPeriodQueue(analyticsCollector, eventHandler); queue = new MediaPeriodQueue(analyticsCollector, eventHandler);
mediaSourceList = new MediaSourceList(/* listener= */ this, analyticsCollector, eventHandler); mediaSourceList =
new MediaSourceList(/* listener= */ this, analyticsCollector, eventHandler, playerId);
// Note: The documentation for Process.THREAD_PRIORITY_AUDIO that states "Applications can // Note: The documentation for Process.THREAD_PRIORITY_AUDIO that states "Applications can
// not normally change to this priority" is incorrect. // not normally change to this priority" is incorrect.
......
library/core/src/main/java/com/google/android/exoplayer2/MediaSourceList.java
...@@ -21,6 +21,7 @@ import static java.lang.Math.min; ...@@ -21,6 +21,7 @@ import static java.lang.Math.min;
import android.os.Handler; import android.os.Handler;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.analytics.AnalyticsCollector; import com.google.android.exoplayer2.analytics.AnalyticsCollector;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.drm.DrmSession; import com.google.android.exoplayer2.drm.DrmSession;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
import com.google.android.exoplayer2.source.LoadEventInfo; import com.google.android.exoplayer2.source.LoadEventInfo;
...@@ -70,6 +71,7 @@ import java.util.Set; ...@@ -70,6 +71,7 @@ import java.util.Set;
private static final String TAG = "MediaSourceList"; private static final String TAG = "MediaSourceList";
private final PlayerId playerId;
private final List<MediaSourceHolder> mediaSourceHolders; private final List<MediaSourceHolder> mediaSourceHolders;
private final IdentityHashMap<MediaPeriod, MediaSourceHolder> mediaSourceByMediaPeriod; private final IdentityHashMap<MediaPeriod, MediaSourceHolder> mediaSourceByMediaPeriod;
private final Map<Object, MediaSourceHolder> mediaSourceByUid; private final Map<Object, MediaSourceHolder> mediaSourceByUid;
...@@ -93,11 +95,14 @@ import java.util.Set; ...@@ -93,11 +95,14 @@ import java.util.Set;
* source events. * source events.
* @param analyticsCollectorHandler The {@link Handler} to call {@link AnalyticsCollector} methods * @param analyticsCollectorHandler The {@link Handler} to call {@link AnalyticsCollector} methods
* on. * on.
* @param playerId The {@link PlayerId} of the player using this list.
*/ */
public MediaSourceList( public MediaSourceList(
MediaSourceListInfoRefreshListener listener, MediaSourceListInfoRefreshListener listener,
@Nullable AnalyticsCollector analyticsCollector, @Nullable AnalyticsCollector analyticsCollector,
Handler analyticsCollectorHandler) { Handler analyticsCollectorHandler,
PlayerId playerId) {
this.playerId = playerId;
mediaSourceListInfoListener = listener; mediaSourceListInfoListener = listener;
shuffleOrder = new DefaultShuffleOrder(0); shuffleOrder = new DefaultShuffleOrder(0);
mediaSourceByMediaPeriod = new IdentityHashMap<>(); mediaSourceByMediaPeriod = new IdentityHashMap<>();
...@@ -440,7 +445,7 @@ import java.util.Set; ...@@ -440,7 +445,7 @@ import java.util.Set;
childSources.put(holder, new MediaSourceAndListener(mediaSource, caller, eventListener)); childSources.put(holder, new MediaSourceAndListener(mediaSource, caller, eventListener));
mediaSource.addEventListener(Util.createHandlerForCurrentOrMainLooper(), eventListener); mediaSource.addEventListener(Util.createHandlerForCurrentOrMainLooper(), eventListener);
mediaSource.addDrmEventListener(Util.createHandlerForCurrentOrMainLooper(), eventListener); mediaSource.addDrmEventListener(Util.createHandlerForCurrentOrMainLooper(), eventListener);
mediaSource.prepareSource(caller, mediaTransferListener); mediaSource.prepareSource(caller, mediaTransferListener, playerId);
} }
private void maybeReleaseChildSource(MediaSourceHolder mediaSourceHolder) { private void maybeReleaseChildSource(MediaSourceHolder mediaSourceHolder) {
......
library/core/src/main/java/com/google/android/exoplayer2/MetadataRetriever.java
...@@ -23,6 +23,7 @@ import android.os.Handler; ...@@ -23,6 +23,7 @@ import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.Message; import android.os.Message;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
import com.google.android.exoplayer2.extractor.ExtractorsFactory; import com.google.android.exoplayer2.extractor.ExtractorsFactory;
import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor; import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
...@@ -140,7 +141,8 @@ public final class MetadataRetriever { ...@@ -140,7 +141,8 @@ public final class MetadataRetriever {
case MESSAGE_PREPARE_SOURCE: case MESSAGE_PREPARE_SOURCE:
MediaItem mediaItem = (MediaItem) msg.obj; MediaItem mediaItem = (MediaItem) msg.obj;
mediaSource = mediaSourceFactory.createMediaSource(mediaItem); mediaSource = mediaSourceFactory.createMediaSource(mediaItem);
mediaSource.prepareSource(mediaSourceCaller, /* mediaTransferListener= */ null); mediaSource.prepareSource(
mediaSourceCaller, /* mediaTransferListener= */ null, PlayerId.UNSET);
mediaSourceHandler.sendEmptyMessage(MESSAGE_CHECK_FOR_FAILURE); mediaSourceHandler.sendEmptyMessage(MESSAGE_CHECK_FOR_FAILURE);
return true; return true;
case MESSAGE_CHECK_FOR_FAILURE: case MESSAGE_CHECK_FOR_FAILURE:
......
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.Renderer; ...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RendererCapabilities; import com.google.android.exoplayer2.RendererCapabilities;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioRendererEventListener;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.extractor.ExtractorsFactory; import com.google.android.exoplayer2.extractor.ExtractorsFactory;
...@@ -956,7 +957,8 @@ public final class DownloadHelper { ...@@ -956,7 +957,8 @@ public final class DownloadHelper {
public boolean handleMessage(Message msg) { public boolean handleMessage(Message msg) {
switch (msg.what) { switch (msg.what) {
case MESSAGE_PREPARE_SOURCE: case MESSAGE_PREPARE_SOURCE:
mediaSource.prepareSource(/* caller= */ this, /* mediaTransferListener= */ null); mediaSource.prepareSource(
/* caller= */ this, /* mediaTransferListener= */ null, PlayerId.UNSET);
mediaSourceHandler.sendEmptyMessage(MESSAGE_CHECK_FOR_FAILURE); mediaSourceHandler.sendEmptyMessage(MESSAGE_CHECK_FOR_FAILURE);
return true; return true;
case MESSAGE_CHECK_FOR_FAILURE: case MESSAGE_CHECK_FOR_FAILURE:
......
library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
...@@ -15,10 +15,13 @@ ...@@ -15,10 +15,13 @@
*/ */
package com.google.android.exoplayer2.source; package com.google.android.exoplayer2.source;
import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -41,6 +44,7 @@ public abstract class BaseMediaSource implements MediaSource { ...@@ -41,6 +44,7 @@ public abstract class BaseMediaSource implements MediaSource {
@Nullable private Looper looper; @Nullable private Looper looper;
@Nullable private Timeline timeline; @Nullable private Timeline timeline;
@Nullable private PlayerId playerId;
public BaseMediaSource() { public BaseMediaSource() {
mediaSourceCallers = new ArrayList<>(/* initialCapacity= */ 1); mediaSourceCallers = new ArrayList<>(/* initialCapacity= */ 1);
...@@ -51,7 +55,7 @@ public abstract class BaseMediaSource implements MediaSource { ...@@ -51,7 +55,7 @@ public abstract class BaseMediaSource implements MediaSource {
/** /**
* Starts source preparation and enables the source, see {@link #prepareSource(MediaSourceCaller, * Starts source preparation and enables the source, see {@link #prepareSource(MediaSourceCaller,
* TransferListener)}. This method is called at most once until the next call to {@link * TransferListener, PlayerId)}. This method is called at most once until the next call to {@link
* #releaseSourceInternal()}. * #releaseSourceInternal()}.
* *
* @param mediaTransferListener The transfer listener which should be informed of any media data * @param mediaTransferListener The transfer listener which should be informed of any media data
...@@ -160,6 +164,16 @@ public abstract class BaseMediaSource implements MediaSource { ...@@ -160,6 +164,16 @@ public abstract class BaseMediaSource implements MediaSource {
return !enabledMediaSourceCallers.isEmpty(); return !enabledMediaSourceCallers.isEmpty();
} }
/**
* Returns the {@link PlayerId} of the player using this media source.
*
* <p>Must only be used when the media source is {@link #prepareSourceInternal(TransferListener)
* prepared}.
*/
protected final PlayerId getPlayerId() {
return checkStateNotNull(playerId);
}
@Override @Override
public final void addEventListener(Handler handler, MediaSourceEventListener eventListener) { public final void addEventListener(Handler handler, MediaSourceEventListener eventListener) {
Assertions.checkNotNull(handler); Assertions.checkNotNull(handler);
...@@ -186,9 +200,12 @@ public abstract class BaseMediaSource implements MediaSource { ...@@ -186,9 +200,12 @@ public abstract class BaseMediaSource implements MediaSource {
@Override @Override
public final void prepareSource( public final void prepareSource(
MediaSourceCaller caller, @Nullable TransferListener mediaTransferListener) { MediaSourceCaller caller,
@Nullable TransferListener mediaTransferListener,
PlayerId playerId) {
Looper looper = Looper.myLooper(); Looper looper = Looper.myLooper();
Assertions.checkArgument(this.looper == null || this.looper == looper); Assertions.checkArgument(this.looper == null || this.looper == looper);
this.playerId = playerId;
@Nullable Timeline timeline = this.timeline; @Nullable Timeline timeline = this.timeline;
mediaSourceCallers.add(caller); mediaSourceCallers.add(caller);
if (this.looper == null) { if (this.looper == null) {
...@@ -226,6 +243,7 @@ public abstract class BaseMediaSource implements MediaSource { ...@@ -226,6 +243,7 @@ public abstract class BaseMediaSource implements MediaSource {
if (mediaSourceCallers.isEmpty()) { if (mediaSourceCallers.isEmpty()) {
looper = null; looper = null;
timeline = null; timeline = null;
playerId = null;
enabledMediaSourceCallers.clear(); enabledMediaSourceCallers.clear();
releaseSourceInternal(); releaseSourceInternal();
} else { } else {
......
library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
...@@ -117,7 +117,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource { ...@@ -117,7 +117,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
childSources.put(id, new MediaSourceAndListener<>(mediaSource, caller, eventListener)); childSources.put(id, new MediaSourceAndListener<>(mediaSource, caller, eventListener));
mediaSource.addEventListener(Assertions.checkNotNull(eventHandler), eventListener); mediaSource.addEventListener(Assertions.checkNotNull(eventHandler), eventListener);
mediaSource.addDrmEventListener(Assertions.checkNotNull(eventHandler), eventListener); mediaSource.addDrmEventListener(Assertions.checkNotNull(eventHandler), eventListener);
mediaSource.prepareSource(caller, mediaTransferListener); mediaSource.prepareSource(caller, mediaTransferListener, getPlayerId());
if (!isEnabled()) { if (!isEnabled()) {
mediaSource.disable(caller); mediaSource.disable(caller);
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
...@@ -20,6 +20,7 @@ import androidx.annotation.Nullable; ...@@ -20,6 +20,7 @@ import androidx.annotation.Nullable;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.PlayerId;
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;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
...@@ -34,7 +35,7 @@ import java.io.IOException; ...@@ -34,7 +35,7 @@ import java.io.IOException;
* provide a new timeline whenever the structure of the media changes. The MediaSource * provide a new timeline whenever the structure of the media changes. The MediaSource
* provides these timelines by calling {@link MediaSourceCaller#onSourceInfoRefreshed} on the * provides these timelines by calling {@link MediaSourceCaller#onSourceInfoRefreshed} on the
* {@link MediaSourceCaller}s passed to {@link #prepareSource(MediaSourceCaller, * {@link MediaSourceCaller}s passed to {@link #prepareSource(MediaSourceCaller,
* TransferListener)}. * TransferListener, PlayerId)}.
* <li>To provide {@link MediaPeriod} instances for the periods in its timeline. MediaPeriods are * <li>To provide {@link MediaPeriod} instances for the periods in its timeline. MediaPeriods are
* obtained by calling {@link #createPeriod(MediaPeriodId, Allocator, long)}, and provide a * obtained by calling {@link #createPeriod(MediaPeriodId, Allocator, long)}, and provide a
* way for the player to load and read the media. * way for the player to load and read the media.
...@@ -184,6 +185,16 @@ public interface MediaSource { ...@@ -184,6 +185,16 @@ public interface MediaSource {
MediaItem getMediaItem(); MediaItem getMediaItem();
/** /**
* @deprecated Implement {@link #prepareSource(MediaSourceCaller, TransferListener, PlayerId)}
* instead.
*/
@Deprecated
default void prepareSource(
MediaSourceCaller caller, @Nullable TransferListener mediaTransferListener) {
prepareSource(caller, mediaTransferListener, PlayerId.UNSET);
}
/**
* 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}.
* *
...@@ -200,15 +211,20 @@ public interface MediaSource { ...@@ -200,15 +211,20 @@ public interface MediaSource {
* transfers. May be null if no listener is available. Note that this listener should be only * transfers. May be null if no listener is available. Note that this listener should be only
* informed of transfers related to the media loads and not of auxiliary loads for manifests * informed of transfers related to the media loads and not of auxiliary loads for manifests
* and other data. * and other data.
* @param playerId The {@link PlayerId} of the player using this media source.
*/ */
void prepareSource(MediaSourceCaller caller, @Nullable TransferListener mediaTransferListener); void prepareSource(
MediaSourceCaller caller,
@Nullable TransferListener mediaTransferListener,
PlayerId playerId);
/** /**
* Throws any pending error encountered while loading or refreshing source information. * Throws any pending error encountered while loading or refreshing source information.
* *
* <p>Should not be called directly from application code. * <p>Should not be called directly from application code.
* *
* <p>Must only be called after {@link #prepareSource(MediaSourceCaller, TransferListener)}. * <p>Must only be called after {@link #prepareSource(MediaSourceCaller, TransferListener,
* PlayerId)}.
*/ */
void maybeThrowSourceInfoRefreshError() throws IOException; void maybeThrowSourceInfoRefreshError() throws IOException;
...@@ -217,7 +233,8 @@ public interface MediaSource { ...@@ -217,7 +233,8 @@ public interface MediaSource {
* *
* <p>Should not be called directly from application code. * <p>Should not be called directly from application code.
* *
* <p>Must only be called after {@link #prepareSource(MediaSourceCaller, TransferListener)}. * <p>Must only be called after {@link #prepareSource(MediaSourceCaller, TransferListener,
* PlayerId)}.
* *
* @param caller The {@link MediaSourceCaller} enabling the source. * @param caller The {@link MediaSourceCaller} enabling the source.
*/ */
......
library/core/src/main/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdsMediaSource.java
...@@ -168,7 +168,7 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource ...@@ -168,7 +168,7 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource
} }
mediaSource.addEventListener(handler, /* eventListener= */ this); mediaSource.addEventListener(handler, /* eventListener= */ this);
mediaSource.addDrmEventListener(handler, /* eventListener= */ this); mediaSource.addDrmEventListener(handler, /* eventListener= */ this);
mediaSource.prepareSource(/* caller= */ this, mediaTransferListener); mediaSource.prepareSource(/* caller= */ this, mediaTransferListener, getPlayerId());
} }
@Override @Override
......
library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
...@@ -23,7 +23,9 @@ import android.net.Uri; ...@@ -23,7 +23,9 @@ import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller;
import com.google.android.exoplayer2.source.SinglePeriodTimeline; import com.google.android.exoplayer2.source.SinglePeriodTimeline;
import com.google.android.exoplayer2.source.ads.AdPlaybackState; import com.google.android.exoplayer2.source.ads.AdPlaybackState;
import com.google.android.exoplayer2.source.ads.SinglePeriodAdTimeline; import com.google.android.exoplayer2.source.ads.SinglePeriodAdTimeline;
...@@ -78,7 +80,8 @@ public final class MediaPeriodQueueTest { ...@@ -78,7 +80,8 @@ public final class MediaPeriodQueueTest {
new MediaSourceList( new MediaSourceList(
mock(MediaSourceList.MediaSourceListInfoRefreshListener.class), mock(MediaSourceList.MediaSourceListInfoRefreshListener.class),
/* analyticsCollector= */ null, /* analyticsCollector= */ null,
new Handler(Looper.getMainLooper())); new Handler(Looper.getMainLooper()),
PlayerId.UNSET);
rendererCapabilities = new RendererCapabilities[0]; rendererCapabilities = new RendererCapabilities[0];
trackSelector = mock(TrackSelector.class); trackSelector = mock(TrackSelector.class);
allocator = mock(Allocator.class); allocator = mock(Allocator.class);
...@@ -738,7 +741,8 @@ public final class MediaPeriodQueueTest { ...@@ -738,7 +741,8 @@ public final class MediaPeriodQueueTest {
new MediaSourceList.MediaSourceHolder(fakeMediaSource, /* useLazyPreparation= */ false); new MediaSourceList.MediaSourceHolder(fakeMediaSource, /* useLazyPreparation= */ false);
mediaSourceList.setMediaSources( mediaSourceList.setMediaSources(
ImmutableList.of(mediaSourceHolder), new FakeShuffleOrder(/* length= */ 1)); ImmutableList.of(mediaSourceHolder), new FakeShuffleOrder(/* length= */ 1));
mediaSourceHolder.mediaSource.prepareSourceInternal(/* mediaTransferListener */ null); mediaSourceHolder.mediaSource.prepareSource(
mock(MediaSourceCaller.class), /* mediaTransferListener */ null, PlayerId.UNSET);
Timeline playlistTimeline = mediaSourceList.createTimeline(); Timeline playlistTimeline = mediaSourceList.createTimeline();
firstPeriodUid = playlistTimeline.getUidOfPeriod(/* periodIndex= */ 0); firstPeriodUid = playlistTimeline.getUidOfPeriod(/* periodIndex= */ 0);
......
library/core/src/test/java/com/google/android/exoplayer2/MediaSourceListTest.java
...@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify; ...@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; 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.analytics.PlayerId;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ShuffleOrder; import com.google.android.exoplayer2.source.ShuffleOrder;
import com.google.android.exoplayer2.testutil.FakeMediaSource; import com.google.android.exoplayer2.testutil.FakeMediaSource;
...@@ -54,7 +55,8 @@ public class MediaSourceListTest { ...@@ -54,7 +55,8 @@ public class MediaSourceListTest {
new MediaSourceList( new MediaSourceList(
mock(MediaSourceList.MediaSourceListInfoRefreshListener.class), mock(MediaSourceList.MediaSourceListInfoRefreshListener.class),
/* analyticsCollector= */ null, /* analyticsCollector= */ null,
Util.createHandlerForCurrentOrMainLooper()); Util.createHandlerForCurrentOrMainLooper(),
PlayerId.UNSET);
} }
@Test @Test
...@@ -92,30 +94,30 @@ public class MediaSourceListTest { ...@@ -92,30 +94,30 @@ public class MediaSourceListTest {
// Verify prepare is called once on prepare. // Verify prepare is called once on prepare.
verify(mockMediaSource1, times(0)) verify(mockMediaSource1, times(0))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
verify(mockMediaSource2, times(0)) verify(mockMediaSource2, times(0))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
mediaSourceList.prepare(/* mediaTransferListener= */ null); mediaSourceList.prepare(/* mediaTransferListener= */ null);
assertThat(mediaSourceList.isPrepared()).isTrue(); assertThat(mediaSourceList.isPrepared()).isTrue();
// Verify prepare is called once on prepare. // Verify prepare is called once on prepare.
verify(mockMediaSource1, times(1)) verify(mockMediaSource1, times(1))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
verify(mockMediaSource2, times(1)) verify(mockMediaSource2, times(1))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
mediaSourceList.release(); mediaSourceList.release();
mediaSourceList.prepare(/* mediaTransferListener= */ null); mediaSourceList.prepare(/* mediaTransferListener= */ null);
// Verify prepare is called a second time on re-prepare. // Verify prepare is called a second time on re-prepare.
verify(mockMediaSource1, times(2)) verify(mockMediaSource1, times(2))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
verify(mockMediaSource2, times(2)) verify(mockMediaSource2, times(2))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
} }
@Test @Test
...@@ -182,10 +184,10 @@ public class MediaSourceListTest { ...@@ -182,10 +184,10 @@ public class MediaSourceListTest {
// Verify sources are prepared. // Verify sources are prepared.
verify(mockMediaSource1, times(1)) verify(mockMediaSource1, times(1))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
verify(mockMediaSource2, times(1)) verify(mockMediaSource2, times(1))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
// 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); MediaSource mockMediaSource3 = mock(MediaSource.class);
...@@ -203,7 +205,7 @@ public class MediaSourceListTest { ...@@ -203,7 +205,7 @@ public class MediaSourceListTest {
assertThat(mediaSources.get(1).isRemoved).isFalse(); assertThat(mediaSources.get(1).isRemoved).isFalse();
verify(mockMediaSource2, times(2)) verify(mockMediaSource2, times(2))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
} }
@Test @Test
...@@ -222,10 +224,10 @@ public class MediaSourceListTest { ...@@ -222,10 +224,10 @@ public class MediaSourceListTest {
// Verify lazy initialization does not call prepare on sources. // Verify lazy initialization does not call prepare on sources.
verify(mockMediaSource1, times(0)) verify(mockMediaSource1, times(0))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
verify(mockMediaSource2, times(0)) verify(mockMediaSource2, times(0))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
for (int i = 0; i < mediaSources.size(); i++) { for (int i = 0; i < mediaSources.size(); i++) {
assertThat(mediaSources.get(i).firstWindowIndexInChild).isEqualTo(i); assertThat(mediaSources.get(i).firstWindowIndexInChild).isEqualTo(i);
...@@ -259,10 +261,10 @@ public class MediaSourceListTest { ...@@ -259,10 +261,10 @@ public class MediaSourceListTest {
// Verify prepare is called on sources when added. // Verify prepare is called on sources when added.
verify(mockMediaSource1, times(1)) verify(mockMediaSource1, times(1))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
verify(mockMediaSource2, times(1)) verify(mockMediaSource2, times(1))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
} }
@Test @Test
...@@ -387,7 +389,7 @@ public class MediaSourceListTest { ...@@ -387,7 +389,7 @@ public class MediaSourceListTest {
new ShuffleOrder.DefaultShuffleOrder(/* length= */ 1)); new ShuffleOrder.DefaultShuffleOrder(/* length= */ 1));
verify(mockMediaSource, times(0)) verify(mockMediaSource, times(0))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
mediaSourceList.release(); mediaSourceList.release();
verify(mockMediaSource, times(0)).releaseSource(any(MediaSource.MediaSourceCaller.class)); verify(mockMediaSource, times(0)).releaseSource(any(MediaSource.MediaSourceCaller.class));
assertThat(mediaSourceHolder.isRemoved).isFalse(); assertThat(mediaSourceHolder.isRemoved).isFalse();
...@@ -406,7 +408,7 @@ public class MediaSourceListTest { ...@@ -406,7 +408,7 @@ public class MediaSourceListTest {
new ShuffleOrder.DefaultShuffleOrder(/* length= */ 1)); new ShuffleOrder.DefaultShuffleOrder(/* length= */ 1));
verify(mockMediaSource, times(1)) verify(mockMediaSource, times(1))
.prepareSource( .prepareSource(
any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull()); any(MediaSource.MediaSourceCaller.class), /* mediaTransferListener= */ isNull(), any());
mediaSourceList.release(); mediaSourceList.release();
verify(mockMediaSource, times(1)).releaseSource(any(MediaSource.MediaSourceCaller.class)); verify(mockMediaSource, times(1)).releaseSource(any(MediaSource.MediaSourceCaller.class));
assertThat(mediaSourceHolder.isRemoved).isFalse(); assertThat(mediaSourceHolder.isRemoved).isFalse();
......
library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
...@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
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.analytics.PlayerId;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller; import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller;
import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder; import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
...@@ -644,7 +645,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -644,7 +645,7 @@ public final class ConcatenatingMediaSourceTest {
() -> { () -> {
MediaSourceCaller caller = mock(MediaSourceCaller.class); MediaSourceCaller caller = mock(MediaSourceCaller.class);
mediaSource.addMediaSources(Arrays.asList(createMediaSources(2))); mediaSource.addMediaSources(Arrays.asList(createMediaSources(2)));
mediaSource.prepareSource(caller, /* mediaTransferListener= */ null); mediaSource.prepareSource(caller, /* mediaTransferListener= */ null, PlayerId.UNSET);
mediaSource.moveMediaSource( mediaSource.moveMediaSource(
/* currentIndex= */ 0, /* currentIndex= */ 0,
/* newIndex= */ 1, /* newIndex= */ 1,
......
library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdsMediaSourceTest.java
...@@ -29,6 +29,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -29,6 +29,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.source.MediaPeriod;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller; import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller;
...@@ -117,7 +118,8 @@ public final class AdsMediaSourceTest { ...@@ -117,7 +118,8 @@ public final class AdsMediaSourceTest {
adMediaSourceFactory, adMediaSourceFactory,
mockAdsLoader, mockAdsLoader,
mockAdViewProvider); mockAdViewProvider);
adsMediaSource.prepareSource(mockMediaSourceCaller, /* mediaTransferListener= */ null); adsMediaSource.prepareSource(
mockMediaSourceCaller, /* mediaTransferListener= */ null, PlayerId.UNSET);
shadowOf(Looper.getMainLooper()).idle(); shadowOf(Looper.getMainLooper()).idle();
verify(mockAdsLoader) verify(mockAdsLoader)
.start( .start(
......
library/core/src/test/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdMediaSourceTest.java
...@@ -40,6 +40,7 @@ import com.google.android.exoplayer2.MediaItem; ...@@ -40,6 +40,7 @@ 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.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
...@@ -104,7 +105,9 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -104,7 +105,9 @@ public final class ServerSideInsertedAdMediaSourceTest {
mediaSource.setAdPlaybackState(adPlaybackState); mediaSource.setAdPlaybackState(adPlaybackState);
mediaSource.prepareSource( mediaSource.prepareSource(
(source, timeline) -> timelineReference.set(timeline), /* mediaTransferListener= */ null); (source, timeline) -> timelineReference.set(timeline),
/* mediaTransferListener= */ null,
PlayerId.UNSET);
runMainLooperUntil(() -> timelineReference.get() != null); runMainLooperUntil(() -> timelineReference.get() != null);
Timeline timeline = timelineReference.get(); Timeline timeline = timelineReference.get();
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
...@@ -27,6 +27,7 @@ import com.google.android.exoplayer2.MediaItem; ...@@ -27,6 +27,7 @@ import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.Timeline.Window; import com.google.android.exoplayer2.Timeline.Window;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.offline.StreamKey; import com.google.android.exoplayer2.offline.StreamKey;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller; import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller;
...@@ -484,7 +485,7 @@ public final class DashMediaSourceTest { ...@@ -484,7 +485,7 @@ public final class DashMediaSourceTest {
countDownLatch.countDown(); countDownLatch.countDown();
} }
}; };
mediaSource.prepareSource(caller, /* mediaTransferListener= */ null); mediaSource.prepareSource(caller, /* mediaTransferListener= */ null, PlayerId.UNSET);
while (!countDownLatch.await(/* timeout= */ 10, MILLISECONDS)) { while (!countDownLatch.await(/* timeout= */ 10, MILLISECONDS)) {
ShadowLooper.idleMainLooper(); ShadowLooper.idleMainLooper();
} }
......
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java
...@@ -25,6 +25,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -25,6 +25,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.offline.StreamKey; import com.google.android.exoplayer2.offline.StreamKey;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist; import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
...@@ -752,7 +753,7 @@ public class HlsMediaSourceTest { ...@@ -752,7 +753,7 @@ public class HlsMediaSourceTest {
List<Timeline> timelines = new ArrayList<>(); List<Timeline> timelines = new ArrayList<>();
MediaSource.MediaSourceCaller mediaSourceCaller = (source, timeline) -> timelines.add(timeline); MediaSource.MediaSourceCaller mediaSourceCaller = (source, timeline) -> timelines.add(timeline);
mediaSource.prepareSource(mediaSourceCaller, null); mediaSource.prepareSource(mediaSourceCaller, /* mediaTransferListener= */ null, PlayerId.UNSET);
runMainLooperUntil(() -> timelines.size() == 1); runMainLooperUntil(() -> timelines.size() == 1);
mediaSource.onPrimaryPlaylistRefreshed(secondPlaylist); mediaSource.onPrimaryPlaylistRefreshed(secondPlaylist);
runMainLooperUntil(() -> timelines.size() == 2); runMainLooperUntil(() -> timelines.size() == 2);
...@@ -785,7 +786,9 @@ public class HlsMediaSourceTest { ...@@ -785,7 +786,9 @@ public class HlsMediaSourceTest {
throws TimeoutException { throws TimeoutException {
AtomicReference<Timeline> receivedTimeline = new AtomicReference<>(); AtomicReference<Timeline> receivedTimeline = new AtomicReference<>();
mediaSource.prepareSource( mediaSource.prepareSource(
(source, timeline) -> receivedTimeline.set(timeline), /* mediaTransferListener= */ null); (source, timeline) -> receivedTimeline.set(timeline),
/* mediaTransferListener= */ null,
PlayerId.UNSET);
runMainLooperUntil(() -> receivedTimeline.get() != null); runMainLooperUntil(() -> receivedTimeline.get() != null);
return receivedTimeline.get(); return receivedTimeline.get();
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
...@@ -26,6 +26,7 @@ import android.os.Looper; ...@@ -26,6 +26,7 @@ import android.os.Looper;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.source.LoadEventInfo; import com.google.android.exoplayer2.source.LoadEventInfo;
import com.google.android.exoplayer2.source.MediaLoadData; import com.google.android.exoplayer2.source.MediaLoadData;
import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.source.MediaPeriod;
...@@ -115,7 +116,8 @@ public class MediaSourceTestRunner { ...@@ -115,7 +116,8 @@ public class MediaSourceTestRunner {
final IOException[] prepareError = new IOException[1]; final IOException[] prepareError = new IOException[1];
runOnPlaybackThread( runOnPlaybackThread(
() -> { () -> {
mediaSource.prepareSource(mediaSourceListener, /* mediaTransferListener= */ null); mediaSource.prepareSource(
mediaSourceListener, /* mediaTransferListener= */ null, PlayerId.UNSET);
try { try {
// TODO: This only catches errors that are set synchronously in prepareSource. To // TODO: This only catches errors that are set synchronously in prepareSource. To
// capture async errors we'll need to poll maybeThrowSourceInfoRefreshError until the // capture async errors we'll need to poll maybeThrowSourceInfoRefreshError until the
......
testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeMediaSourceFactoryTest.java
...@@ -21,6 +21,7 @@ import androidx.annotation.Nullable; ...@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Timeline.Window; import com.google.android.exoplayer2.Timeline.Window;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.junit.Test; import org.junit.Test;
...@@ -42,7 +43,8 @@ public class FakeMediaSourceFactoryTest { ...@@ -42,7 +43,8 @@ public class FakeMediaSourceFactoryTest {
int firstWindowIndex = timeline.getFirstWindowIndex(/* shuffleModeEnabled= */ false); int firstWindowIndex = timeline.getFirstWindowIndex(/* shuffleModeEnabled= */ false);
reportedMediaItem.set(timeline.getWindow(firstWindowIndex, new Window()).mediaItem); reportedMediaItem.set(timeline.getWindow(firstWindowIndex, new Window()).mediaItem);
}, },
/* mediaTransferListener= */ null); /* mediaTransferListener= */ null,
PlayerId.UNSET);
assertThat(reportedMediaItem.get()).isSameInstanceAs(mediaItem); assertThat(reportedMediaItem.get()).isSameInstanceAs(mediaItem);
assertThat(mediaSource.getMediaItem()).isSameInstanceAs(mediaItem); assertThat(mediaSource.getMediaItem()).isSameInstanceAs(mediaItem);
......
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