From 69423bc2b4c6cdfa6f29c7d66a97a5a73b63b45a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 12 Jan 2021 18:35:33 +0000
Subject: [PATCH] Remove deprecated MappingTrackSelector methods

PiperOrigin-RevId: 351400274
---
 RELEASENOTES.md                               |  8 ++++++
 .../trackselection/MappingTrackSelector.java  | 25 -------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 864c5462dd..f2c1acade0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -19,6 +19,14 @@
             application is calling `SimpleExoPlayer.setVideoListener(null)`,
             make sure to replace this call with
             `SimpleExoPlayer.removeVideoListener(VideoListener)`.
+        *   `MappedTrackInfo.length` - Use `MappedTrackInfo.getRendererCount()`
+            instead.
+        *   `MappedTrackInfo.getTrackTypeRendererSupport(int)` - Use
+            `MappedTrackInfo.getTypeSupport(int)`.
+        *   `MappedTrackInfo.getTrackFormatSupport(int, int, int)` - Use
+            `MappedTrackInfo.getTrackSupport(int, int, int)`.
+        *   `MappedTrackInfo.getUnassociatedTrackGroups()` - Use
+            `MappedTrackInfo.getUnmappedTrackGroups()`.
     *   Remove deprecated interface `AdaptiveMediaSourceEventListener`. Use
         `MediaSourceEventListener` instead.
     *   Add a `LivePlaybackSpeedControl` component to control the playback speed
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
index 276443da2d..41f36c4970 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
@@ -90,9 +90,6 @@ public abstract class MappingTrackSelector extends TrackSelector {
      */
     public static final int RENDERER_SUPPORT_PLAYABLE_TRACKS = 3;
 
-    /** @deprecated Use {@link #getRendererCount()}. */
-    @Deprecated public final int length;
-
     private final int rendererCount;
     private final String[] rendererNames;
     private final int[] rendererTrackTypes;
@@ -126,7 +123,6 @@ public abstract class MappingTrackSelector extends TrackSelector {
       this.rendererMixedMimeTypeAdaptiveSupports = rendererMixedMimeTypeAdaptiveSupports;
       this.unmappedTrackGroups = unmappedTrackGroups;
       this.rendererCount = rendererTrackTypes.length;
-      this.length = rendererCount;
     }
 
     /** Returns the number of renderers. */
@@ -199,13 +195,6 @@ public abstract class MappingTrackSelector extends TrackSelector {
       return bestRendererSupport;
     }
 
-    /** @deprecated Use {@link #getTypeSupport(int)}. */
-    @Deprecated
-    @RendererSupport
-    public int getTrackTypeRendererSupport(int trackType) {
-      return getTypeSupport(trackType);
-    }
-
     /**
      * Returns the extent to which tracks of a specified type are supported. This is the best level
      * of support obtained from {@link #getRendererSupport(int)} for all renderers that handle the
@@ -226,13 +215,6 @@ public abstract class MappingTrackSelector extends TrackSelector {
       return bestRendererSupport;
     }
 
-    /** @deprecated Use {@link #getTrackSupport(int, int, int)}. */
-    @Deprecated
-    @FormatSupport
-    public int getTrackFormatSupport(int rendererIndex, int groupIndex, int trackIndex) {
-      return getTrackSupport(rendererIndex, groupIndex, trackIndex);
-    }
-
     /**
      * Returns the extent to which an individual track is supported by the renderer.
      *
@@ -317,17 +299,10 @@ public abstract class MappingTrackSelector extends TrackSelector {
           : adaptiveSupport;
     }
 
-    /** @deprecated Use {@link #getUnmappedTrackGroups()}. */
-    @Deprecated
-    public TrackGroupArray getUnassociatedTrackGroups() {
-      return getUnmappedTrackGroups();
-    }
-
     /** Returns {@link TrackGroup}s not mapped to any renderer. */
     public TrackGroupArray getUnmappedTrackGroups() {
       return unmappedTrackGroups;
     }
-
   }
 
   @Nullable private MappedTrackInfo currentMappedTrackInfo;