Skip to content

SDK / exoplayer

Go to a project
Commit 87e141d3 by tonihei Committed by Andrew Lewis
Options

Remove boilerplate setting up FakeTimeline and FakeMediaSource. 

In many cases it doesn't matter for the test itself how many windows
a timeline has, or even how the timeline of a MediaSource looks like.

And since we introduced the MediaItem-based APIs, single-window
Timelines are the only fully supported Timelines. Thus there is no
point in specifiying this explicitly.

Using these assumptions, we can remove some boilerplate when setting
up standard FakeTimelines or FakeMediaSources with a standard
FakeTimeline.

#exofixit

PiperOrigin-RevId: 344210395
parent b7047a24
Expand all
Inline Side-by-side
Showing with 41 additions and 34 deletions
library/core/src/test/java/com/google/android/exoplayer2/MediaSourceListTest.java
...@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.source.MediaSource; ...@@ -30,7 +30,6 @@ 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;
import com.google.android.exoplayer2.testutil.FakeShuffleOrder; import com.google.android.exoplayer2.testutil.FakeShuffleOrder;
import com.google.android.exoplayer2.testutil.FakeTimeline;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -528,11 +527,11 @@ public class MediaSourceListTest { ...@@ -528,11 +527,11 @@ public class MediaSourceListTest {
} }
private static List<MediaSourceList.MediaSourceHolder> createFakeHolders() { private static List<MediaSourceList.MediaSourceHolder> createFakeHolders() {
MediaSource fakeMediaSource = new FakeMediaSource(new FakeTimeline(1));
List<MediaSourceList.MediaSourceHolder> holders = new ArrayList<>(); List<MediaSourceList.MediaSourceHolder> holders = new ArrayList<>();
for (int i = 0; i < MEDIA_SOURCE_LIST_SIZE; i++) { for (int i = 0; i < MEDIA_SOURCE_LIST_SIZE; i++) {
holders.add( holders.add(
new MediaSourceList.MediaSourceHolder(fakeMediaSource, /* useLazyPreparation= */ true)); new MediaSourceList.MediaSourceHolder(
new FakeMediaSource(), /* useLazyPreparation= */ true));
} }
return holders; return holders;
} }
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -160,7 +160,7 @@ public final class AnalyticsCollectorTest { ...@@ -160,7 +160,7 @@ public final class AnalyticsCollectorTest {
ExoPlayerTestRunner.VIDEO_FORMAT.buildUpon().setDrmInitData(DRM_DATA_1).build(); ExoPlayerTestRunner.VIDEO_FORMAT.buildUpon().setDrmInitData(DRM_DATA_1).build();
private static final int TIMEOUT_MS = 10_000; private static final int TIMEOUT_MS = 10_000;
private static final Timeline SINGLE_PERIOD_TIMELINE = new FakeTimeline(/* windowCount= */ 1); private static final Timeline SINGLE_PERIOD_TIMELINE = new FakeTimeline();
private static final EventWindowAndPeriodId WINDOW_0 = private static final EventWindowAndPeriodId WINDOW_0 =
new EventWindowAndPeriodId(/* windowIndex= */ 0, /* mediaPeriodId= */ null); new EventWindowAndPeriodId(/* windowIndex= */ 0, /* mediaPeriodId= */ null);
private static final EventWindowAndPeriodId WINDOW_1 = private static final EventWindowAndPeriodId WINDOW_1 =
...@@ -1520,11 +1520,9 @@ public final class AnalyticsCollectorTest { ...@@ -1520,11 +1520,9 @@ public final class AnalyticsCollectorTest {
public void onPlayerError_thrownDuringRendererEnableAtPeriodTransition_isReportedForNewPeriod() public void onPlayerError_thrownDuringRendererEnableAtPeriodTransition_isReportedForNewPeriod()
throws Exception { throws Exception {
FakeMediaSource source0 = FakeMediaSource source0 =
new FakeMediaSource( new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.VIDEO_FORMAT);
new FakeTimeline(/* windowCount= */ 1), ExoPlayerTestRunner.VIDEO_FORMAT);
FakeMediaSource source1 = FakeMediaSource source1 =
new FakeMediaSource( new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.AUDIO_FORMAT);
new FakeTimeline(/* windowCount= */ 1), ExoPlayerTestRunner.AUDIO_FORMAT);
RenderersFactory renderersFactory = RenderersFactory renderersFactory =
(eventHandler, videoListener, audioListener, textOutput, metadataOutput) -> (eventHandler, videoListener, audioListener, textOutput, metadataOutput) ->
new Renderer[] { new Renderer[] {
...@@ -1554,11 +1552,9 @@ public final class AnalyticsCollectorTest { ...@@ -1554,11 +1552,9 @@ public final class AnalyticsCollectorTest {
public void onPlayerError_thrownDuringRenderAtPeriodTransition_isReportedForNewPeriod() public void onPlayerError_thrownDuringRenderAtPeriodTransition_isReportedForNewPeriod()
throws Exception { throws Exception {
FakeMediaSource source0 = FakeMediaSource source0 =
new FakeMediaSource( new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.VIDEO_FORMAT);
new FakeTimeline(/* windowCount= */ 1), ExoPlayerTestRunner.VIDEO_FORMAT);
FakeMediaSource source1 = FakeMediaSource source1 =
new FakeMediaSource( new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.AUDIO_FORMAT);
new FakeTimeline(/* windowCount= */ 1), ExoPlayerTestRunner.AUDIO_FORMAT);
RenderersFactory renderersFactory = RenderersFactory renderersFactory =
(eventHandler, videoListener, audioListener, textOutput, metadataOutput) -> (eventHandler, videoListener, audioListener, textOutput, metadataOutput) ->
new Renderer[] { new Renderer[] {
...@@ -1589,8 +1585,7 @@ public final class AnalyticsCollectorTest { ...@@ -1589,8 +1585,7 @@ public final class AnalyticsCollectorTest {
onPlayerError_thrownDuringRendererReplaceStreamAtPeriodTransition_isReportedForNewPeriod() onPlayerError_thrownDuringRendererReplaceStreamAtPeriodTransition_isReportedForNewPeriod()
throws Exception { throws Exception {
FakeMediaSource source = FakeMediaSource source =
new FakeMediaSource( new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.AUDIO_FORMAT);
new FakeTimeline(/* windowCount= */ 1), ExoPlayerTestRunner.AUDIO_FORMAT);
RenderersFactory renderersFactory = RenderersFactory renderersFactory =
(eventHandler, videoListener, audioListener, textOutput, metadataOutput) -> (eventHandler, videoListener, audioListener, textOutput, metadataOutput) ->
new Renderer[] { new Renderer[] {
...@@ -1634,7 +1629,7 @@ public final class AnalyticsCollectorTest { ...@@ -1634,7 +1629,7 @@ public final class AnalyticsCollectorTest {
player.addAnalyticsListener(listener); player.addAnalyticsListener(listener);
// Trigger some simultaneous events. // Trigger some simultaneous events.
player.setMediaSource(new FakeMediaSource(new FakeTimeline(/* windowCount= */ 1), formats)); player.setMediaSource(new FakeMediaSource(new FakeTimeline(), formats));
player.seekTo(2_000); player.seekTo(2_000);
player.setPlaybackParameters(new PlaybackParameters(/* speed= */ 2.0f)); player.setPlaybackParameters(new PlaybackParameters(/* speed= */ 2.0f));
ShadowLooper.runMainLooperToNextTask(); ShadowLooper.runMainLooperToNextTask();
...@@ -1642,7 +1637,7 @@ public final class AnalyticsCollectorTest { ...@@ -1642,7 +1637,7 @@ public final class AnalyticsCollectorTest {
// Move to another item and fail with a third one to trigger events with different EventTimes. // Move to another item and fail with a third one to trigger events with different EventTimes.
player.prepare(); player.prepare();
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY); TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY);
player.addMediaSource(new FakeMediaSource(new FakeTimeline(/* windowCount= */ 1), formats)); player.addMediaSource(new FakeMediaSource(new FakeTimeline(), formats));
player.play(); player.play();
TestPlayerRunHelper.runUntilPositionDiscontinuity( TestPlayerRunHelper.runUntilPositionDiscontinuity(
player, Player.DISCONTINUITY_REASON_PERIOD_TRANSITION); player, Player.DISCONTINUITY_REASON_PERIOD_TRANSITION);
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java
...@@ -61,7 +61,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -61,7 +61,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void updateSessions_withoutMediaPeriodId_createsNewSession() { public void updateSessions_withoutMediaPeriodId_createsNewSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
EventTime eventTime = createEventTime(timeline, /* windowIndex= */ 0, /* mediaPeriodId */ null); EventTime eventTime = createEventTime(timeline, /* windowIndex= */ 0, /* mediaPeriodId */ null);
sessionManager.updateSessions(eventTime); sessionManager.updateSessions(eventTime);
...@@ -73,7 +73,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -73,7 +73,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void updateSessions_withMediaPeriodId_createsNewSession() { public void updateSessions_withMediaPeriodId_createsNewSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -92,7 +92,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -92,7 +92,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void public void
updateSessions_ofSameWindow_withMediaPeriodId_afterWithoutMediaPeriodId_doesNotCreateNewSession() { updateSessions_ofSameWindow_withMediaPeriodId_afterWithoutMediaPeriodId_doesNotCreateNewSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -113,7 +113,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -113,7 +113,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void updateSessions_ofSameWindow_withAd_afterWithoutMediaPeriodId_createsNewSession() { public void updateSessions_ofSameWindow_withAd_afterWithoutMediaPeriodId_createsNewSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), timeline.getUidOfPeriod(/* periodIndex= */ 0),
...@@ -141,7 +141,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -141,7 +141,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void public void
updateSessions_ofSameWindow_withoutMediaPeriodId_afterMediaPeriodId_doesNotCreateNewSession() { updateSessions_ofSameWindow_withoutMediaPeriodId_afterMediaPeriodId_doesNotCreateNewSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -310,7 +310,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -310,7 +310,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void updateSessions_ofSameWindow_withNewWindowSequenceNumber_createsNewSession() { public void updateSessions_ofSameWindow_withNewWindowSequenceNumber_createsNewSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId1 = MediaPeriodId mediaPeriodId1 =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -339,7 +339,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -339,7 +339,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void public void
updateSessions_withoutMediaPeriodId_andPreviouslyCreatedSessions_doesNotCreateNewSession() { updateSessions_withoutMediaPeriodId_andPreviouslyCreatedSessions_doesNotCreateNewSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId1 = MediaPeriodId mediaPeriodId1 =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -372,7 +372,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -372,7 +372,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void updateSessions_afterSessionForMediaPeriodId_withSameMediaPeriodId_returnsSameValue() { public void updateSessions_afterSessionForMediaPeriodId_withSameMediaPeriodId_returnsSameValue() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -390,7 +390,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -390,7 +390,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void updateSessions_withoutMediaPeriodId_afterSessionForMediaPeriodId_returnsSameValue() { public void updateSessions_withoutMediaPeriodId_afterSessionForMediaPeriodId_returnsSameValue() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -474,7 +474,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -474,7 +474,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void getSessionForMediaPeriodId_returnsValue_butDoesNotCreateSession() { public void getSessionForMediaPeriodId_returnsValue_butDoesNotCreateSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -488,7 +488,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -488,7 +488,7 @@ public final class DefaultPlaybackSessionManagerTest {
public void belongsToSession_withSameWindowIndex_returnsTrue() { public void belongsToSession_withSameWindowIndex_returnsTrue() {
EventTime eventTime = EventTime eventTime =
createEventTime(Timeline.EMPTY, /* windowIndex= */ 0, /* mediaPeriodId= */ null); createEventTime(Timeline.EMPTY, /* windowIndex= */ 0, /* mediaPeriodId= */ null);
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
EventTime eventTimeWithTimeline = EventTime eventTimeWithTimeline =
createEventTime(timeline, /* windowIndex= */ 0, /* mediaPeriodId= */ null); createEventTime(timeline, /* windowIndex= */ 0, /* mediaPeriodId= */ null);
MediaPeriodId mediaPeriodId = MediaPeriodId mediaPeriodId =
...@@ -532,7 +532,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -532,7 +532,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void belongsToSession_withOtherWindowSequenceNumber_returnsFalse() { public void belongsToSession_withOtherWindowSequenceNumber_returnsFalse() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
MediaPeriodId mediaPeriodId1 = MediaPeriodId mediaPeriodId1 =
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0); timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0);
...@@ -592,7 +592,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -592,7 +592,7 @@ public final class DefaultPlaybackSessionManagerTest {
createEventTime(Timeline.EMPTY, /* windowIndex= */ 1, /* mediaPeriodId= */ null); createEventTime(Timeline.EMPTY, /* windowIndex= */ 1, /* mediaPeriodId= */ null);
sessionManager.updateSessions(eventTime1); sessionManager.updateSessions(eventTime1);
sessionManager.updateSessions(eventTime2); sessionManager.updateSessions(eventTime2);
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
EventTime newTimelineEventTime = EventTime newTimelineEventTime =
createEventTime(timeline, /* windowIndex= */ 0, /* mediaPeriodId= */ null); createEventTime(timeline, /* windowIndex= */ 0, /* mediaPeriodId= */ null);
...@@ -827,7 +827,7 @@ public final class DefaultPlaybackSessionManagerTest { ...@@ -827,7 +827,7 @@ public final class DefaultPlaybackSessionManagerTest {
@Test @Test
public void positionDiscontinuity_toSameWindow_withoutMediaPeriodId_doesNotFinishSession() { public void positionDiscontinuity_toSameWindow_withoutMediaPeriodId_doesNotFinishSession() {
Timeline timeline = new FakeTimeline(/* windowCount= */ 1); Timeline timeline = new FakeTimeline();
EventTime eventTime1 = EventTime eventTime1 =
createEventTime( createEventTime(
timeline, timeline,
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java
...@@ -50,7 +50,7 @@ public final class PlaybackStatsListenerTest { ...@@ -50,7 +50,7 @@ public final class PlaybackStatsListenerTest {
/* currentMediaPeriodId= */ null, /* currentMediaPeriodId= */ null,
/* currentPlaybackPositionMs= */ 0, /* currentPlaybackPositionMs= */ 0,
/* totalBufferedDurationMs= */ 0); /* totalBufferedDurationMs= */ 0);
private static final Timeline TEST_TIMELINE = new FakeTimeline(/* windowCount= */ 1); private static final Timeline TEST_TIMELINE = new FakeTimeline();
private static final MediaSource.MediaPeriodId TEST_MEDIA_PERIOD_ID = private static final MediaSource.MediaPeriodId TEST_MEDIA_PERIOD_ID =
new MediaSource.MediaPeriodId( new MediaSource.MediaPeriodId(
TEST_TIMELINE.getPeriod(/* periodIndex= */ 0, new Timeline.Period(), /* setIds= */ true) TEST_TIMELINE.getPeriod(/* periodIndex= */ 0, new Timeline.Period(), /* setIds= */ true)
......
library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
...@@ -854,7 +854,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -854,7 +854,7 @@ public final class ConcatenatingMediaSourceTest {
@Test @Test
public void duplicateNestedMediaSources() throws IOException, InterruptedException { public void duplicateNestedMediaSources() throws IOException, InterruptedException {
Timeline childTimeline = new FakeTimeline(/* windowCount= */ 1); Timeline childTimeline = new FakeTimeline();
FakeMediaSource childSource = new FakeMediaSource(childTimeline); FakeMediaSource childSource = new FakeMediaSource(childTimeline);
ConcatenatingMediaSource nestedConcatenation = new ConcatenatingMediaSource(); ConcatenatingMediaSource nestedConcatenation = new ConcatenatingMediaSource();
......
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
...@@ -110,7 +110,7 @@ public final class DefaultTrackSelectorTest { ...@@ -110,7 +110,7 @@ public final class DefaultTrackSelectorTest {
private static final TrackSelection[] TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER = private static final TrackSelection[] TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER =
new TrackSelection[] {new FixedTrackSelection(VIDEO_TRACK_GROUP, 0), null}; new TrackSelection[] {new FixedTrackSelection(VIDEO_TRACK_GROUP, 0), null};
private static final Timeline TIMELINE = new FakeTimeline(/* windowCount= */ 1); private static final Timeline TIMELINE = new FakeTimeline();
private static MediaPeriodId periodId; private static MediaPeriodId periodId;
......
library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
...@@ -52,7 +52,7 @@ public final class MappingTrackSelectorTest { ...@@ -52,7 +52,7 @@ public final class MappingTrackSelectorTest {
private static final TrackGroup AUDIO_TRACK_GROUP = buildTrackGroup(MimeTypes.AUDIO_AAC); private static final TrackGroup AUDIO_TRACK_GROUP = buildTrackGroup(MimeTypes.AUDIO_AAC);
private static final TrackGroup METADATA_TRACK_GROUP = buildTrackGroup(MimeTypes.APPLICATION_ID3); private static final TrackGroup METADATA_TRACK_GROUP = buildTrackGroup(MimeTypes.APPLICATION_ID3);
private static final Timeline TIMELINE = new FakeTimeline(/* windowCount= */ 1); private static final Timeline TIMELINE = new FakeTimeline();
private static MediaPeriodId periodId; private static MediaPeriodId periodId;
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
...@@ -92,6 +92,11 @@ public class FakeMediaSource extends BaseMediaSource { ...@@ -92,6 +92,11 @@ public class FakeMediaSource extends BaseMediaSource {
@Nullable private Handler sourceInfoRefreshHandler; @Nullable private Handler sourceInfoRefreshHandler;
@Nullable private TransferListener transferListener; @Nullable private TransferListener transferListener;
/** Creates a {@link FakeMediaSource} with a default {@link FakeTimeline}. */
public FakeMediaSource() {
this(new FakeTimeline());
}
/** /**
* Creates a {@link FakeMediaSource}. This media source creates {@link FakeMediaPeriod}s with a * Creates a {@link FakeMediaSource}. This media source creates {@link FakeMediaPeriod}s with a
* {@link TrackGroupArray} using the given {@link Format}s. The provided {@link Timeline} may be * {@link TrackGroupArray} using the given {@link Format}s. The provided {@link Timeline} may be
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
...@@ -267,6 +267,14 @@ public final class FakeTimeline extends Timeline { ...@@ -267,6 +267,14 @@ public final class FakeTimeline extends Timeline {
} }
/** /**
* Create a fake timeline with one seekable, non-dynamic window with one period and a duration of
* {@link TimelineWindowDefinition#DEFAULT_WINDOW_DURATION_US}.
*/
public FakeTimeline() {
this(/* windowCount= */ 1);
}
/**
* Creates a fake timeline with the given number of seekable, non-dynamic windows with one period * Creates a fake timeline with the given number of seekable, non-dynamic windows with one period
* with a duration of {@link TimelineWindowDefinition#DEFAULT_WINDOW_DURATION_US} each. * with a duration of {@link TimelineWindowDefinition#DEFAULT_WINDOW_DURATION_US} each.
* *
......
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