diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
index 7a27b600be..65c077f55e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
@@ -65,12 +65,6 @@ public class IntentUtil {
public static final String SPHERICAL_STEREO_MODE_TOP_BOTTOM = "top_bottom";
public static final String SPHERICAL_STEREO_MODE_LEFT_RIGHT = "left_right";
- // Player configuration extras.
-
- public static final String ABR_ALGORITHM_EXTRA = "abr_algorithm";
- public static final String ABR_ALGORITHM_DEFAULT = "default";
- public static final String ABR_ALGORITHM_RANDOM = "random";
-
// Media item configuration extras.
public static final String URI_EXTRA = "uri";
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index 8ddecdad59..050e5c0d49 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -45,11 +45,8 @@ import com.google.android.exoplayer2.source.BehindLiveWindowException;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.source.ads.AdsLoader;
-import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
-import com.google.android.exoplayer2.trackselection.RandomTrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.ui.DebugTextViewHelper;
import com.google.android.exoplayer2.ui.StyledPlayerControlView;
@@ -300,24 +297,12 @@ public class PlayerActivity extends AppCompatActivity
return;
}
- TrackSelection.Factory trackSelectionFactory;
- String abrAlgorithm = intent.getStringExtra(IntentUtil.ABR_ALGORITHM_EXTRA);
- if (abrAlgorithm == null || IntentUtil.ABR_ALGORITHM_DEFAULT.equals(abrAlgorithm)) {
- trackSelectionFactory = new AdaptiveTrackSelection.Factory();
- } else if (IntentUtil.ABR_ALGORITHM_RANDOM.equals(abrAlgorithm)) {
- trackSelectionFactory = new RandomTrackSelection.Factory();
- } else {
- showToast(R.string.error_unrecognized_abr_algorithm);
- finish();
- return;
- }
-
boolean preferExtensionDecoders =
intent.getBooleanExtra(IntentUtil.PREFER_EXTENSION_DECODERS_EXTRA, false);
RenderersFactory renderersFactory =
DemoUtil.buildRenderersFactory(/* context= */ this, preferExtensionDecoders);
- trackSelector = new DefaultTrackSelector(/* context= */ this, trackSelectionFactory);
+ trackSelector = new DefaultTrackSelector(/* context= */ this);
trackSelector.setParameters(trackSelectorParameters);
lastSeenTrackGroupArray = null;
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index ae79fb84f5..703eb921a9 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -79,7 +79,6 @@ public class SampleChooserActivity extends AppCompatActivity
private DownloadTracker downloadTracker;
private SampleAdapter sampleAdapter;
private MenuItem preferExtensionDecodersMenuItem;
- private MenuItem randomAbrMenuItem;
private ExpandableListView sampleListView;
@Override
@@ -135,7 +134,6 @@ public class SampleChooserActivity extends AppCompatActivity
inflater.inflate(R.menu.sample_chooser_menu, menu);
preferExtensionDecodersMenuItem = menu.findItem(R.id.prefer_extension_decoders);
preferExtensionDecodersMenuItem.setVisible(useExtensionRenderers);
- randomAbrMenuItem = menu.findItem(R.id.random_abr);
return true;
}
@@ -229,11 +227,6 @@ public class SampleChooserActivity extends AppCompatActivity
intent.putExtra(
IntentUtil.PREFER_EXTENSION_DECODERS_EXTRA,
isNonNullAndChecked(preferExtensionDecodersMenuItem));
- String abrAlgorithm =
- isNonNullAndChecked(randomAbrMenuItem)
- ? IntentUtil.ABR_ALGORITHM_RANDOM
- : IntentUtil.ABR_ALGORITHM_DEFAULT;
- intent.putExtra(IntentUtil.ABR_ALGORITHM_EXTRA, abrAlgorithm);
IntentUtil.addToIntent(playlistHolder.mediaItems, intent);
startActivity(intent);
return true;
diff --git a/demos/main/src/main/res/menu/sample_chooser_menu.xml b/demos/main/src/main/res/menu/sample_chooser_menu.xml
index 9934e9db95..259b2f0f38 100644
--- a/demos/main/src/main/res/menu/sample_chooser_menu.xml
+++ b/demos/main/src/main/res/menu/sample_chooser_menu.xml
@@ -19,8 +19,4 @@
android:title="@string/prefer_extension_decoders"
android:checkable="true"
app:showAsAction="never"/>
-