sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support multiple transitions to STATE_ENDED in ExoPlayerTestRunner.

Browse source 
Currently testRunner.blockUntilEnded waits for the first transition to
STATE_ENDED or _IDLE before returning. In order to support tests with
player repreparations after one playback finished, this change adds an
option to specifiy the number of expected transitions to ended.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176484047
This commit is contained in:
tonihei 2017-11-21 02:44:09 -08:00 committed by Oliver Woodman
parent e1d960db68
commit a8d867be37
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
View file

@ -100,6 +100,7 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener {
private RenderersFactory renderersFactory; private RenderersFactory renderersFactory;
private ActionSchedule actionSchedule; private ActionSchedule actionSchedule;
private Player.EventListener eventListener; private Player.EventListener eventListener;
private Integer expectedPlayerEndedCount;
/** /**
* Sets a {@link Timeline} to be used by a {@link FakeMediaSource} in the test runner. The * Sets a {@link Timeline} to be used by a {@link FakeMediaSource} in the test runner. The
@ -255,6 +256,20 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener {
return this; return this;
} }
/**
* Sets the number of times the test runner is expected to reach the {@link Player#STATE_ENDED}
* or {@link Player#STATE_IDLE}. The default is 1. This affects how long
* {@link ExoPlayerTestRunner#blockUntilEnded(long)} waits.
*
* @param expectedPlayerEndedCount The number of times the player is expected to reach the ended
* or idle state.
* @return This builder.
*/
public Builder setExpectedPlayerEndedCount(int expectedPlayerEndedCount) {
this.expectedPlayerEndedCount = expectedPlayerEndedCount;
return this;
}
/** /**
* Builds an {@link ExoPlayerTestRunner} using the provided values or their defaults. * Builds an {@link ExoPlayerTestRunner} using the provided values or their defaults.
* *
@ -299,8 +314,11 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener {
} }
mediaSource = new FakeMediaSource(timeline, manifest, supportedFormats); mediaSource = new FakeMediaSource(timeline, manifest, supportedFormats);
} }
if (expectedPlayerEndedCount == null) {
expectedPlayerEndedCount = 1;
}
return new ExoPlayerTestRunner(playerFactory, mediaSource, renderersFactory, trackSelector, return new ExoPlayerTestRunner(playerFactory, mediaSource, renderersFactory, trackSelector,
loadControl, actionSchedule, eventListener); loadControl, actionSchedule, eventListener, expectedPlayerEndedCount);
} }
} }
@ -328,7 +346,8 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener {
private ExoPlayerTestRunner(PlayerFactory playerFactory, MediaSource mediaSource, private ExoPlayerTestRunner(PlayerFactory playerFactory, MediaSource mediaSource,
RenderersFactory renderersFactory, MappingTrackSelector trackSelector, RenderersFactory renderersFactory, MappingTrackSelector trackSelector,
LoadControl loadControl, ActionSchedule actionSchedule, Player.EventListener eventListener) { LoadControl loadControl, ActionSchedule actionSchedule, Player.EventListener eventListener,
int expectedPlayerEndedCount) {
this.playerFactory = playerFactory; this.playerFactory = playerFactory;
this.mediaSource = mediaSource; this.mediaSource = mediaSource;
this.renderersFactory = renderersFactory; this.renderersFactory = renderersFactory;
@ -341,7 +360,7 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener {
this.timelineChangeReasons = new ArrayList<>(); this.timelineChangeReasons = new ArrayList<>();
this.periodIndices = new ArrayList<>(); this.periodIndices = new ArrayList<>();
this.discontinuityReasons = new ArrayList<>(); this.discontinuityReasons = new ArrayList<>();
this.endedCountDownLatch = new CountDownLatch(1); this.endedCountDownLatch = new CountDownLatch(expectedPlayerEndedCount);
this.playerThread = new HandlerThread("ExoPlayerTest thread"); this.playerThread = new HandlerThread("ExoPlayerTest thread");
playerThread.start(); playerThread.start();
this.handler = new Handler(playerThread.getLooper()); this.handler = new Handler(playerThread.getLooper());
@ -514,7 +533,9 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener {
if (this.exception == null) { if (this.exception == null) {
this.exception = exception; this.exception = exception;
} }
endedCountDownLatch.countDown(); while (endedCountDownLatch.getCount() > 0) {
endedCountDownLatch.countDown();
}
} }
// Player.EventListener // Player.EventListener