Skip to content

SDK / exoplayer

Go to a project
Commit 3568dca3 by olly Committed by Oliver Woodman
Options

Make tests use DefaultTrackSelector 

Issue: #3915

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=192259167
parent 986095a4
Expand all
Inline Side-by-side
Showing with 70 additions and 78 deletions
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
......@@ -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;
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
......@@ -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.
}
}
}
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
......@@ -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));
}
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
......@@ -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,
......
testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
......@@ -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;
......
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