loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make tests use DefaultTrackSelector

Browse Source 
Issue: #3915

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=192259167
This commit is contained in:
olly 2018-04-10 02:49:27 -07:00 committed by Oliver Woodman
parent 986095a4a3
commit 3568dca3b1
6 changed files with 70 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
View File

@ -50,6 +50,7 @@ import com.google.android.exoplayer2.testutil.ExoHostedTest;
import com.google.android.exoplayer2.testutil.HostActivity;
import com.google.android.exoplayer2.testutil.HostActivity.HostedTest;
import com.google.android.exoplayer2.testutil.MetricsLogger;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.trackselection.RandomTrackSelection;
@ -264,8 +265,8 @@ public final class DashTestRunner {
}
@Override
protected MappingTrackSelector buildTrackSelector(HostActivity host,
BandwidthMeter bandwidthMeter) {
protected DefaultTrackSelector buildTrackSelector(
HostActivity host, BandwidthMeter bandwidthMeter) {
return trackSelector;
}
@ -375,7 +376,7 @@ public final class DashTestRunner {
}
private static final class DashTestTrackSelector extends MappingTrackSelector {
private static final class DashTestTrackSelector extends DefaultTrackSelector {
private final String tag;
private final String audioFormatId;

96
testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
View File

@ -32,7 +32,7 @@ import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.testutil.ActionSchedule.ActionNode;
import com.google.android.exoplayer2.testutil.ActionSchedule.PlayerRunnable;
import com.google.android.exoplayer2.testutil.ActionSchedule.PlayerTarget;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.util.HandlerWrapper;
/**
@ -64,7 +64,7 @@ public abstract class Action {
*/
public final void doActionAndScheduleNext(
SimpleExoPlayer player,
MappingTrackSelector trackSelector,
DefaultTrackSelector trackSelector,
Surface surface,
HandlerWrapper handler,
ActionNode nextAction) {
@ -75,7 +75,7 @@ public abstract class Action {
}
/**
* Called by {@link #doActionAndScheduleNext(SimpleExoPlayer, MappingTrackSelector, Surface,
* Called by {@link #doActionAndScheduleNext(SimpleExoPlayer, DefaultTrackSelector, Surface,
* HandlerWrapper, ActionNode)} to perform the action and to schedule the next action node.
*
* @param player The player to which the action should be applied.
@ -86,7 +86,7 @@ public abstract class Action {
*/
protected void doActionAndScheduleNextImpl(
SimpleExoPlayer player,
MappingTrackSelector trackSelector,
DefaultTrackSelector trackSelector,
Surface surface,
HandlerWrapper handler,
ActionNode nextAction) {
@ -97,7 +97,7 @@ public abstract class Action {
}
/**
* Called by {@link #doActionAndScheduleNextImpl(SimpleExoPlayer, MappingTrackSelector, Surface,
* Called by {@link #doActionAndScheduleNextImpl(SimpleExoPlayer, DefaultTrackSelector, Surface,
* HandlerWrapper, ActionNode)} to perform the action.
*
* @param player The player to which the action should be applied.
@ -105,7 +105,7 @@ public abstract class Action {
* @param surface The surface to use when applying actions.
*/
protected abstract void doActionImpl(
SimpleExoPlayer player, MappingTrackSelector trackSelector, Surface surface);
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface);
/**
* Calls {@link Player#seekTo(long)} or {@link Player#seekTo(int, long)}.
@ -141,8 +141,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
if (windowIndex == null) {
player.seekTo(positionMs);
} else {
@ -183,8 +183,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
if (reset == null) {
player.stop();
} else {
@ -212,16 +212,14 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player.setPlayWhenReady(playWhenReady);
}
}
/**
* Calls {@link MappingTrackSelector#setRendererDisabled(int, boolean)}.
*/
/** Calls {@link DefaultTrackSelector#setRendererDisabled(int, boolean)}. */
public static final class SetRendererDisabled extends Action {
private final int rendererIndex;
@ -239,8 +237,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
trackSelector.setRendererDisabled(rendererIndex, disabled);
}
@ -259,8 +257,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player.clearVideoSurface();
}
@ -279,8 +277,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player.setVideoSurface(surface);
}
@ -314,8 +312,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player.prepare(mediaSource, resetPosition, resetState);
}
@ -337,8 +335,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player.setRepeatMode(repeatMode);
}
@ -360,8 +358,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player.setShuffleModeEnabled(shuffleModeEnabled);
}
}
@ -407,7 +405,7 @@ public abstract class Action {
@Override
protected void doActionImpl(
final SimpleExoPlayer player, MappingTrackSelector trackSelector, Surface surface) {
final SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
if (target instanceof PlayerTarget) {
((PlayerTarget) target).setPlayer(player);
}
@ -440,8 +438,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player.setPlaybackParameters(playbackParameters);
}
@ -463,7 +461,7 @@ public abstract class Action {
@Override
protected void doActionImpl(
SimpleExoPlayer player, MappingTrackSelector trackSelector, Surface surface) {
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player
.createMessage(
new Target() {
@ -500,7 +498,7 @@ public abstract class Action {
@Override
protected void doActionAndScheduleNextImpl(
final SimpleExoPlayer player,
final MappingTrackSelector trackSelector,
final DefaultTrackSelector trackSelector,
final Surface surface,
final HandlerWrapper handler,
final ActionNode nextAction) {
@ -534,7 +532,7 @@ public abstract class Action {
@Override
protected void doActionImpl(
SimpleExoPlayer player, MappingTrackSelector trackSelector, Surface surface) {
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
// Not triggered.
}
}
@ -561,7 +559,7 @@ public abstract class Action {
@Override
protected void doActionAndScheduleNextImpl(
final SimpleExoPlayer player,
final MappingTrackSelector trackSelector,
final DefaultTrackSelector trackSelector,
final Surface surface,
final HandlerWrapper handler,
final ActionNode nextAction) {
@ -587,11 +585,10 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
// Not triggered.
}
}
/**
@ -609,7 +606,7 @@ public abstract class Action {
@Override
protected void doActionAndScheduleNextImpl(
final SimpleExoPlayer player,
final MappingTrackSelector trackSelector,
final DefaultTrackSelector trackSelector,
final Surface surface,
final HandlerWrapper handler,
final ActionNode nextAction) {
@ -626,11 +623,10 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
// Not triggered.
}
}
/**
@ -652,7 +648,7 @@ public abstract class Action {
@Override
protected void doActionAndScheduleNextImpl(
final SimpleExoPlayer player,
final MappingTrackSelector trackSelector,
final DefaultTrackSelector trackSelector,
final Surface surface,
final HandlerWrapper handler,
final ActionNode nextAction) {
@ -675,11 +671,10 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
// Not triggered.
}
}
/**
@ -697,7 +692,7 @@ public abstract class Action {
@Override
protected void doActionAndScheduleNextImpl(
final SimpleExoPlayer player,
final MappingTrackSelector trackSelector,
final DefaultTrackSelector trackSelector,
final Surface surface,
final HandlerWrapper handler,
final ActionNode nextAction) {
@ -714,11 +709,10 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
// Not triggered.
}
}
/**
@ -737,8 +731,8 @@ public abstract class Action {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
if (runnable instanceof PlayerRunnable) {
((PlayerRunnable) runnable).setPlayer(player);
}

18
testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
View File

@ -45,7 +45,7 @@ import com.google.android.exoplayer2.testutil.Action.WaitForPlaybackState;
import com.google.android.exoplayer2.testutil.Action.WaitForPositionDiscontinuity;
import com.google.android.exoplayer2.testutil.Action.WaitForSeekProcessed;
import com.google.android.exoplayer2.testutil.Action.WaitForTimelineChanged;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.HandlerWrapper;
@ -90,7 +90,7 @@ public final class ActionSchedule {
*/
/* package */ void start(
SimpleExoPlayer player,
MappingTrackSelector trackSelector,
DefaultTrackSelector trackSelector,
Surface surface,
HandlerWrapper mainHandler,
@Nullable Callback callback) {
@ -494,7 +494,7 @@ public final class ActionSchedule {
private ActionNode next;
private SimpleExoPlayer player;
private MappingTrackSelector trackSelector;
private DefaultTrackSelector trackSelector;
private Surface surface;
private HandlerWrapper mainHandler;
@ -538,7 +538,7 @@ public final class ActionSchedule {
*/
public void schedule(
SimpleExoPlayer player,
MappingTrackSelector trackSelector,
DefaultTrackSelector trackSelector,
Surface surface,
HandlerWrapper mainHandler) {
this.player = player;
@ -580,11 +580,10 @@ public final class ActionSchedule {
}
@Override
protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
Surface surface) {
protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
// Do nothing.
}
}
/**
@ -605,7 +604,7 @@ public final class ActionSchedule {
@Override
protected void doActionAndScheduleNextImpl(
SimpleExoPlayer player,
MappingTrackSelector trackSelector,
DefaultTrackSelector trackSelector,
Surface surface,
HandlerWrapper handler,
ActionNode nextAction) {
@ -623,10 +622,9 @@ public final class ActionSchedule {
@Override
protected void doActionImpl(
SimpleExoPlayer player, MappingTrackSelector trackSelector, Surface surface) {
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
// Not triggered.
}
}
}

6
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
View File

@ -76,7 +76,7 @@ public abstract class ExoHostedTest extends Player.DefaultEventListener implemen
private ActionSchedule pendingSchedule;
private HandlerWrapper actionHandler;
private MappingTrackSelector trackSelector;
private DefaultTrackSelector trackSelector;
private SimpleExoPlayer player;
private Surface surface;
private ExoPlaybackException playerError;
@ -359,8 +359,8 @@ public abstract class ExoHostedTest extends Player.DefaultEventListener implemen
}
@SuppressWarnings("unused")
protected MappingTrackSelector buildTrackSelector(HostActivity host,
BandwidthMeter bandwidthMeter) {
protected DefaultTrackSelector buildTrackSelector(
HostActivity host, BandwidthMeter bandwidthMeter) {
return new DefaultTrackSelector(new AdaptiveTrackSelection.Factory(bandwidthMeter));
}

15
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
View File

@ -36,7 +36,6 @@ import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.util.Clock;
@ -78,7 +77,7 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener
private Timeline timeline;
private Object manifest;
private MediaSource mediaSource;
private MappingTrackSelector trackSelector;
private DefaultTrackSelector trackSelector;
private LoadControl loadControl;
private Format[] supportedFormats;
private Renderer[] renderers;
@ -137,13 +136,13 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener
}
/**
* Sets a {@link MappingTrackSelector} to be used by the test runner. The default value is a
* {@link DefaultTrackSelector}.
* Sets a {@link DefaultTrackSelector} to be used by the test runner. The default value is a
* {@link DefaultTrackSelector} in its initial configuration.
*
* @param trackSelector A {@link MappingTrackSelector} to be used by the test runner.
* @param trackSelector A {@link DefaultTrackSelector} to be used by the test runner.
* @return This builder.
*/
public Builder setTrackSelector(MappingTrackSelector trackSelector) {
public Builder setTrackSelector(DefaultTrackSelector trackSelector) {
this.trackSelector = trackSelector;
return this;
}
@ -338,7 +337,7 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener
private final Clock clock;
private final MediaSource mediaSource;
private final RenderersFactory renderersFactory;
private final MappingTrackSelector trackSelector;
private final DefaultTrackSelector trackSelector;
private final LoadControl loadControl;
private final @Nullable ActionSchedule actionSchedule;
private final @Nullable Player.EventListener eventListener;
@ -364,7 +363,7 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener
Clock clock,
MediaSource mediaSource,
RenderersFactory renderersFactory,
MappingTrackSelector trackSelector,
DefaultTrackSelector trackSelector,
LoadControl loadControl,
@Nullable ActionSchedule actionSchedule,
@Nullable Player.EventListener eventListener,

6
testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
View File

@ -20,13 +20,13 @@ import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.RendererCapabilities;
import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelection;
import java.util.ArrayList;
import java.util.List;
/** A fake {@link MappingTrackSelector} that returns {@link FakeTrackSelection}s. */
public class FakeTrackSelector extends MappingTrackSelector {
/** A fake {@link DefaultTrackSelector} that returns {@link FakeTrackSelection}s. */
public class FakeTrackSelector extends DefaultTrackSelector {
private final List<FakeTrackSelection> selectedTrackSelections = new ArrayList<>();
private final boolean mayReuseTrackSelection;